Merge "[3.0] Change integration api of NativeRenderSurface" into tizen_3.0

diff --git a/adaptors/integration-api/wayland/native-render-surface.h b/adaptors/integration-api/wayland/native-render-surface.h
index 565eec2..3b0cd42 100644 (file)
--- 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 (file)
--- 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 )