X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fintegration-api%2Fadaptor-framework%2Frender-surface-interface.h;h=2c7f6b7ba4cb3b4a1d4abaef4be79b365f994a64;hb=5ccadb7c0624b39fca29026a716ce7b721b89ffd;hp=6de11829232b76e4325d8be4ccd89486ff639ef0;hpb=a67bddb9946a20e3eed7d71ade2ed8b20eccdf38;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/dali/integration-api/adaptor-framework/render-surface-interface.h b/dali/integration-api/adaptor-framework/render-surface-interface.h
index 6de1182..2c7f6b7 100644
--- a/dali/integration-api/adaptor-framework/render-surface-interface.h
+++ b/dali/integration-api/adaptor-framework/render-surface-interface.h
@@ -24,6 +24,9 @@
 #include <dali/public-api/math/vector4.h>
 #include <dali/public-api/math/rect.h>
 #include <dali/public-api/object/any.h>
+#include <dali/public-api/object/weak-handle.h>
+#include <dali/integration-api/scene.h>
+#include <dali/public-api/math/uint-16-pair.h>
 
 namespace Dali
 {
@@ -31,11 +34,6 @@ namespace Dali
 class DisplayConnection;
 class ThreadSynchronizationInterface;
 
-namespace Integration
-{
-class Scene;
-}
-
 namespace Internal
 {
 namespace Adaptor
@@ -48,7 +46,8 @@ class GraphicsInterface;
 /**
  * @brief The position and size of the render surface.
  */
-typedef Dali::Rect<int> PositionSize;
+using PositionSize =  Dali::Rect<int>;
+using SurfaceSize = Uint16Pair;
 
 /**
  * @brief Interface for a render surface onto which Dali draws.
@@ -82,7 +81,7 @@ public:
   : mAdaptor( nullptr ),
     mGraphics( nullptr ),
     mDisplayConnection( nullptr ),
-    mScene( nullptr ),
+    mScene(),
     mDepthBufferRequired( Integration::DepthBufferAvailable::FALSE ),
     mStencilBufferRequired( Integration::StencilBufferAvailable::FALSE )
   {}
@@ -218,8 +217,7 @@ public:
    */
   void SetScene( Dali::Integration::Scene& scene )
   {
-    // This will be changed to use the WeakHandle later.
-    mScene = &scene;
+    mScene = scene;
   }
 
 private:
@@ -239,7 +237,7 @@ protected:
   Dali::Internal::Adaptor::AdaptorInternalServices* mAdaptor;
   Dali::Internal::Adaptor::GraphicsInterface* mGraphics;
   Dali::DisplayConnection* mDisplayConnection;
-  Dali::Integration::Scene* mScene;
+  WeakHandle< Dali::Integration::Scene > mScene;
 
 private: