Revert "[Tizen] Add New API of Scene with screen orientation"

This reverts commit ad6d388c8a19b63b415e131d5c829d0a4fdd65c7.

diff --git a/dali/integration-api/scene.cpp b/dali/integration-api/scene.cpp
index 2675ba5..192ad2e 100644 (file)
--- a/dali/integration-api/scene.cpp
+++ b/dali/integration-api/scene.cpp
@@ -33,12 +33,6 @@ Scene Scene::New(Size size)
   return Scene(internal.Get());
 }
 
-Scene Scene::New(Size size, int orientation)
-{
-  Internal::ScenePtr internal = Internal::Scene::New(size, orientation);
-  return Scene(internal.Get());
-}
-
 Scene Scene::DownCast(BaseHandle handle)
 {
   return Scene(dynamic_cast<Dali::Internal::Scene*>(handle.GetObjectPtr()));

diff --git a/dali/integration-api/scene.h b/dali/integration-api/scene.h
index 1f6a60a..c663e67 100644 (file)
--- a/dali/integration-api/scene.h
+++ b/dali/integration-api/scene.h
@@ -72,16 +72,6 @@ public:
   static Scene New(Size size);
 
   /**
-   * @brief Create an initialized Scene handle.
-   *
-   * @param[in] size The size of the set surface for this scene
-   * @param[in] orientation The orientation of the set surface for this scene
-   *
-   * @return a handle to a newly allocated Dali resource.
-   */
-  static Scene New( Size size, int orientation );
-
-  /**
    * @brief Downcast an Object handle to Scene handle.
    *
    * If handle points to a Scene object the downcast produces

diff --git a/dali/internal/event/common/scene-impl.cpp b/dali/internal/event/common/scene-impl.cpp
index 208c1f7..45bda4d 100755 (executable)
--- a/dali/internal/event/common/scene-impl.cpp
+++ b/dali/internal/event/common/scene-impl.cpp
@@ -48,17 +48,7 @@ ScenePtr Scene::New( Size size )
   ScenePtr scene = new Scene;
 
   // Second-phase construction
-  scene->Initialize( size, 0 );
-
-  return scene;
-}
-
-ScenePtr Scene::New( Size size, int orientation )
-{
-  ScenePtr scene = new Scene;
-
-  // Second-phase construction
-  scene->Initialize( size, orientation );
+  scene->Initialize( size );
 
   return scene;
 }
@@ -105,7 +95,7 @@ Scene::~Scene()
   // When this destructor is called, the scene has either already been removed from Core or Core has already been destroyed
 }
 
-void Scene::Initialize( Size size, int orientation )
+void Scene::Initialize( Size size )
 {
   ThreadLocalStorage* tls = ThreadLocalStorage::GetInternal();
 
@@ -141,7 +131,6 @@ void Scene::Initialize( Size size, int orientation )
   // Create the default render-task and ensure clear is enabled on it to show the background color
   RenderTaskPtr renderTask = mRenderTaskList->CreateTask( mRootLayer.Get(), mDefaultCamera.Get() );
   renderTask->SetClearEnabled(true);
-  mSurfaceOrientation = orientation;
 
   SurfaceResized( size.width, size.height, mSurfaceOrientation, false );
 

diff --git a/dali/internal/event/common/scene-impl.h b/dali/internal/event/common/scene-impl.h
index c84d4c6..6597ddc 100755 (executable)
--- a/dali/internal/event/common/scene-impl.h
+++ b/dali/internal/event/common/scene-impl.h
@@ -117,11 +117,6 @@ public:
   static ScenePtr New( Size size );
 
   /**
-   * @copydoc Dali::Integration::Scene::New
-   */
-  static ScenePtr New( Size size, int orientation );
-
-  /**
    * virtual destructor
    */
   ~Scene() override;
@@ -345,9 +340,8 @@ private:
    * Second-phase constructor.
    *
    * @param[in] size The size of the set surface
-   * @param[in] orientation The orientation of the set surface for this scene
    */
-  void Initialize( Size size, int orientation );
+  void Initialize( Size size );
 
   // Undefined
   Scene(const Scene&) = delete;