Merge "[Tizen][AT-SPI] Rework intercepting key events" into tizen

[platform/core/uifw/dali-adaptor.git] / dali / internal / adaptor / common / adaptor-impl.h

diff --git a/dali/internal/adaptor/common/adaptor-impl.h b/dali/internal/adaptor/common/adaptor-impl.h
index a1e5be6..23459c3 100644 (file)
--- a/dali/internal/adaptor/common/adaptor-impl.h
+++ b/dali/internal/adaptor/common/adaptor-impl.h
@@ -28,7 +28,6 @@
 #include <dali/public-api/signals/callback.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/text-clipboard.h>
 #include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <dali/integration-api/adaptor-framework/scene-holder-impl.h>
 #include <dali/integration-api/adaptor-framework/trigger-event-factory.h>
@@ -51,11 +50,6 @@ namespace Dali
 {
 class RenderSurfaceInterface;
 
-namespace Accessibility
-{
-class Bridge;
-}
-
 namespace Integration
 {
 class Core;
@@ -97,6 +91,7 @@ class Adaptor : public Integration::RenderController,
 public:
   using AdaptorSignalType       = Dali::Adaptor::AdaptorSignalType;
   using WindowCreatedSignalType = Dali::Adaptor::WindowCreatedSignalType;
+  using LocaleChangedSignalType = Dali::Adaptor::LocaleChangedSignalType;
 
   using SurfaceSize = Uint16Pair; ///< Surface size type
 
@@ -174,6 +169,9 @@ public:
    */
   void SceneCreated();
 
+  /**
+   * Get the application package name
+   */
   static std::string GetApplicationPackageName();
 
 public: // AdaptorInternalServices implementation
@@ -247,7 +245,7 @@ public: // AdaptorInternalServices implementation
   /**
    * @copydoc Dali::Adaptor::AddIdle()
    */
-  virtual bool AddIdle(CallbackBase* callback, bool hasReturnValue, bool forceAdd);
+  virtual bool AddIdle(CallbackBase* callback, bool hasReturnValue);
 
   /**
    * Adds a new Window instance to the Adaptor
@@ -426,6 +424,12 @@ public:
   void SurfaceResizeComplete(Dali::RenderSurfaceInterface* surface, SurfaceSize surfaceSize);
 
   /**
+   * @brief Increase surface resize completed counter.
+   * This API will be ignored if thread controller is not exist.
+   */
+  void IncreaseSurfaceResizeCounter();
+
+  /**
    * Sets layout direction of root by system language
    * @param[in] locale System locale
    */
@@ -442,6 +446,11 @@ public:
   const LogFactoryInterface& GetLogFactory();
 
   /**
+   * @copydoc Dali::Adaptor::GetTraceFactory
+   */
+  const TraceFactoryInterface& GetTraceFactory();
+
+  /**
    * @copydoc Dali::Adaptor::RegisterProcessor
    */
   void RegisterProcessor(Integration::Processor& processor, bool postProcessor);
@@ -515,6 +524,11 @@ public: //AdaptorInternalServices
   void GetWindowContainerInterface(WindowContainer& windows) override;
 
   /**
+   * copydoc Dali::Internal::Adaptor::AdaptorInternalServices::GetTextureUploadManager()
+   */
+  Devel::TextureUploadManager& GetTextureUploadManager() override;
+
+  /**
    * @brief Get the configuration manager
    * @return The configuration manager, or null if it hasn't been created yet
    */
@@ -548,9 +562,22 @@ public: // Signals
     return mWindowCreatedSignal;
   }
 
+  /**
+   * @copydoc Dali::Adaptor::LocaleChangedSignal
+   */
+  LocaleChangedSignalType& LocaleChangedSignal()
+  {
+    return mLocaleChangedSignal;
+  }
+
 public: // From Dali::Internal::Adaptor::CoreEventInterface
   /**
-   * @copydoc Dali::Internal::Adaptor:CoreEventInterface:::ProcessCoreEvents()
+   * @copydoc Dali::Internal::Adaptor::CoreEventInterface:::FlushUpdateMessages()
+   */
+  void FlushUpdateMessages() override;
+
+  /**
+   * @copydoc Dali::Internal::Adaptor::CoreEventInterface:::ProcessCoreEvents()
    */
   void ProcessCoreEvents() override;
 
@@ -560,7 +587,7 @@ private: // From Dali::Internal::Adaptor::CoreEventInterface
    */
   void QueueCoreEvent(const Dali::Integration::Event& event) override;
 
-private: // From Dali::Integration::RenderController
+public: // From Dali::Integration::RenderController
   /**
    * @copydoc Dali::Integration::RenderController::RequestUpdate()
    */
@@ -622,6 +649,11 @@ private:
   void SetupSystemInformation();
 
   /**
+   * Remove system information if needs
+   */
+  void RemoveSystemInformation();
+
+  /**
    * Adds a callback to be run when entering an idle state.
    *
    * A callback of the following type should be used:
@@ -630,7 +662,7 @@ private:
    * @endcode
    * This callback will be called repeatedly as long as it returns true. A return of 0 deletes this callback.
    */
-  bool AddIdleEnterer(CallbackBase* callback, bool forceAdd);
+  bool AddIdleEnterer(CallbackBase* callback);
 
   /**
    * Removes a previously added the idle enterer callback.
@@ -675,6 +707,7 @@ private:                                          // Data
   AdaptorSignalType       mResizedSignal;         ///< Resized signal.
   AdaptorSignalType       mLanguageChangedSignal; ///< Language changed signal.
   WindowCreatedSignalType mWindowCreatedSignal;   ///< Window created signal.
+  LocaleChangedSignalType mLocaleChangedSignal;   ///< Locale changed signal.
 
   Dali::Adaptor&           mAdaptor;          ///< Reference to public adaptor instance.
   State                    mState;            ///< Current state of the adaptor
@@ -701,6 +734,7 @@ private:                                          // Data
   PerformanceInterface*            mPerformanceInterface;                  ///< Performance interface
   KernelTrace                      mKernelTracer;                          ///< Kernel tracer
   SystemTrace                      mSystemTracer;                          ///< System tracer
+  Devel::TextureUploadManager      mTextureUploadManager;                  ///< TextureUploadManager
   ObjectProfiler*                  mObjectProfiler;                        ///< Tracks object lifetime for profiling
   Dali::Timer                      mMemoryPoolTimer;                       ///< Logs memory pool capacity
   SlotDelegate<Adaptor>            mMemoryPoolTimerSlotDelegate;
@@ -713,13 +747,6 @@ private:                                          // Data
 
   std::unique_ptr<Integration::AddOnManager> mAddOnManager; ///< Pointer to the addon manager
 
-  class AccessibilityObserver : public ConnectionTracker
-  {
-  public:
-    void OnAccessibleKeyEvent(const Dali::KeyEvent& event);
-  };
-  AccessibilityObserver mAccessibilityObserver;
-
 public:
   inline static Adaptor& GetImplementation(Dali::Adaptor& adaptor)
   {