Merge "Protect dereferencing null in Node" into devel/master

[platform/core/uifw/dali-core.git] / dali / integration-api / scene.cpp

diff --git a/dali/integration-api/scene.cpp b/dali/integration-api/scene.cpp
index 4963c8f..8fb7a7c 100644 (file)
--- a/dali/integration-api/scene.cpp
+++ b/dali/integration-api/scene.cpp
@@ -30,7 +30,7 @@ namespace Dali
 {
 namespace Integration
 {
-Scene Scene::New(Size size, int orientation)
+Scene Scene::New(Size size, int32_t orientation)
 {
   Internal::ScenePtr internal = Internal::Scene::New(size, orientation);
   return Scene(internal.Get());
@@ -164,16 +164,36 @@ void Scene::GetFramePresentedCallback(FrameCallbackContainer& callbacks)
   GetImplementation(*this).GetFramePresentedCallback(callbacks);
 }
 
-void Scene::SurfaceRotated(float width, float height, int orientation)
+void Scene::SurfaceRotated(float width, float height, int32_t orientation)
 {
   GetImplementation(*this).SurfaceRotated(width, height, orientation);
 }
 
+int32_t Scene::GetCurrentSurfaceOrientation() const
+{
+  return GetImplementation(*this).GetCurrentSurfaceOrientation();
+}
+
+const Rect<int32_t>& Scene::GetCurrentSurfaceRect() const
+{
+  return GetImplementation(*this).GetCurrentSurfaceRect();
+}
+
 bool Scene::IsSurfaceRectChanged() const
 {
   return GetImplementation(*this).IsSurfaceRectChanged();
 }
 
+void Scene::SetRotationCompletedAcknowledgement()
+{
+  GetImplementation(*this).SetRotationCompletedAcknowledgement();
+}
+
+bool Scene::IsRotationCompletedAcknowledgementSet() const
+{
+  return GetImplementation(*this).IsRotationCompletedAcknowledgementSet();
+}
+
 Scene::EventProcessingFinishedSignalType& Scene::EventProcessingFinishedSignal()
 {
   return GetImplementation(*this).EventProcessingFinishedSignal();