X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali%2Fintegration-api%2Fadaptor-framework%2Fadaptor.h;h=85d018af14be21c99cb7204e1d3455b1d4c4ad08;hb=c02a4175107e990b28e2b603641c8839b738b1c3;hp=e72fba70b681edd48475a4677b782141fc07e8b3;hpb=398db97500b00d1a7efdbbbc69eb60956b88b038;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/dali/integration-api/adaptor-framework/adaptor.h b/dali/integration-api/adaptor-framework/adaptor.h
old mode 100755
new mode 100644
index e72fba7..85d018a
--- a/dali/integration-api/adaptor-framework/adaptor.h
+++ b/dali/integration-api/adaptor-framework/adaptor.h
@@ -2,7 +2,7 @@
 #define DALI_INTEGRATION_ADAPTOR_H
 
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,20 +23,19 @@
 #include <dali/public-api/signals/dali-signal.h>
 #include <dali/public-api/math/uint-16-pair.h>
 #include <dali/public-api/math/rect.h>
-#include <dali/public-api/events/touch-event.h>
-#include <dali/public-api/common/view-mode.h>
 #include <dali/public-api/object/any.h>
+#include <dali/devel-api/events/touch-point.h>
 #include <dali/integration-api/processor-interface.h>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/adaptor-framework/window.h>
-#include <dali/public-api/adaptor-framework/application-configuration.h>
 #include <dali/public-api/dali-adaptor-common.h>
 #include <dali/integration-api/adaptor-framework/log-factory-interface.h>
 
 namespace Dali
 {
 
+class ObjectRegistry;
 class RenderSurfaceInterface;
 
 using WindowContainer = std::vector<Window>;
@@ -135,15 +134,6 @@ public:
   static Adaptor& New( Window window );
 
   /**
-   * @brief Create a new adaptor using the window.
-   *
-   * @param[in] window The window to draw onto
-   * @param[in] configuration The context loss configuration.
-   * @return a reference to the adaptor handle
-   */
-  static Adaptor& New( Window window, Configuration::ContextLoss configuration );
-
-  /**
    * @brief Create a new adaptor using render surface.
    *
    * @param[in] window The window to draw onto
@@ -153,16 +143,6 @@ public:
   static Adaptor& New( Window window, const Dali::RenderSurfaceInterface& surface );
 
   /**
-   * @brief Create a new adaptor using render surface.
-   *
-   * @param[in] window The window to draw onto
-   * @param[in] surface The surface to draw onto
-   * @param[in] configuration The context loss configuration.
-   * @return a reference to the adaptor handle
-   */
-  static Adaptor& New( Window window, const Dali::RenderSurfaceInterface& surface, Configuration::ContextLoss configuration = Configuration::APPLICATION_DOES_NOT_HANDLE_CONTEXT_LOSS);
-
-  /**
    * @brief Create a new adaptor using the SceneHolder.
    *
    * @param[in] sceneHolder The SceneHolder to draw onto
@@ -171,15 +151,6 @@ public:
   static Adaptor& New( Dali::Integration::SceneHolder sceneHolder );
 
   /**
-   * @brief Create a new adaptor using the SceneHolder.
-   *
-   * @param[in] sceneHolder The SceneHolder to draw onto
-   * @param[in] configuration The context loss configuration.
-   * @return a reference to the adaptor handle
-   */
-  static Adaptor& New( Dali::Integration::SceneHolder sceneHolder, Configuration::ContextLoss configuration );
-
-  /**
    * @brief Create a new adaptor using render surface.
    *
    * @param[in] sceneHolder The SceneHolder to draw onto
@@ -189,16 +160,6 @@ public:
   static Adaptor& New( Dali::Integration::SceneHolder sceneHolder, const Dali::RenderSurfaceInterface& surface );
 
   /**
-   * @brief Create a new adaptor using render surface.
-   *
-   * @param[in] sceneHolder The SceneHolder to draw onto
-   * @param[in] surface The surface to draw onto
-   * @param[in] configuration The context loss configuration.
-   * @return a reference to the adaptor handle
-   */
-  static Adaptor& New( Dali::Integration::SceneHolder sceneHolder, const Dali::RenderSurfaceInterface& surface, Configuration::ContextLoss configuration = Configuration::APPLICATION_DOES_NOT_HANDLE_CONTEXT_LOSS);
-
-  /**
    * @brief Virtual Destructor.
    */
   virtual ~Adaptor();
@@ -254,14 +215,8 @@ public:
    * @brief Adds a new Window instance to the Adaptor
    *
    * @param[in]  childWindow The child window instance
-   * @param[in]  childWindowName The child window title/name
-   * @param[in]  childWindowClassName The class name that the child window belongs to
-   * @param[in]  childWindowMode The mode of the child window
    */
-  bool AddWindow( Dali::Integration::SceneHolder childWindow,
-                  const std::string& childWindowName,
-                  const std::string& childWindowClassName,
-                  bool childWindowMode );
+  bool AddWindow( Dali::Integration::SceneHolder childWindow );
 
   /**
    * @brief Removes a previously added @p callback.
@@ -274,6 +229,13 @@ public:
   void RemoveIdle( CallbackBase* callback );
 
   /**
+   * @brief Processes the idle callbacks.
+   *
+   * @note This function is intended to be used in the case there is no instance of a Dali::Application i.e. DALi is used in a implementation of a plugin of an application.
+   */
+  void ProcessIdle();
+
+  /**
    * @brief Replaces the rendering surface
    *
    * @param[in] window The window to replace the surface for
@@ -471,6 +433,12 @@ public:
   SceneHolderList GetSceneHolders() const;
 
   /**
+   * @brief Gets the Object registry.
+   * @return The object registry
+   */
+  Dali::ObjectRegistry GetObjectRegistry() const;
+
+  /**
    * @brief Called when the window becomes fully or partially visible.
    */
   void OnWindowShown();