From 283bac2c393372a421231221e180516b0f1fe44e Mon Sep 17 00:00:00 2001 From: taeyoon Date: Tue, 27 Dec 2016 15:01:34 +0900 Subject: [PATCH] [3.0] Change integration api of NativeRenderSurface WaitDrawableAfterReplaceSurface to WaitUntilSurfaceReplaced Change-Id: I64a41629721cd1edb8c4c585c9d4fbf7395a1c04 --- adaptors/integration-api/wayland/native-render-surface.h | 4 ++-- adaptors/tizen/native-render-surface-tizen.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/adaptors/integration-api/wayland/native-render-surface.h b/adaptors/integration-api/wayland/native-render-surface.h index 565eec2..3b0cd42 100644 --- a/adaptors/integration-api/wayland/native-render-surface.h +++ b/adaptors/integration-api/wayland/native-render-surface.h @@ -80,10 +80,10 @@ public: // API virtual Any GetSurface(); /** - * @brief Waits tbm surface after replace surface + * @brief Waits until surface is replaced * After tbm surface is acquired in PostRender, this function is finished. */ - void WaitDrawableAfterReplaceSurface(); + void WaitUntilSurfaceReplaced(); public: // from Dali::RenderSurface diff --git a/adaptors/tizen/native-render-surface-tizen.cpp b/adaptors/tizen/native-render-surface-tizen.cpp index a43aa12..787507f 100644 --- a/adaptors/tizen/native-render-surface-tizen.cpp +++ b/adaptors/tizen/native-render-surface-tizen.cpp @@ -263,7 +263,7 @@ void NativeRenderSurface::ReleaseLock() } } -void NativeRenderSurface::WaitDrawableAfterReplaceSurface() +void NativeRenderSurface::WaitUntilSurfaceReplaced() { ConditionalWait::ScopedLock lock( mImpl->mTbmSurfaceCondition ); while( !mImpl->mDrawableCompleted ) -- 2.7.4