Merge "[Tizen] CanvasRenderer::Shape: Add ResetPath() method for reset path informati...

diff --git a/dali/integration-api/adaptor-framework/adaptor.h b/dali/integration-api/adaptor-framework/adaptor.h
index 43b4913..9bcb8c6 100644 (file)
--- 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) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.
@@ -406,15 +406,17 @@ public:
   /**
    * @brief Register a processor implementing the Integration::Processor interface with dali-core.
    * @param[in] processor the Processor to register
+   * @param[in] postProcessor set this processor required to be called after size negotiation. Default is false.
    * @note using this api does not maintain the processor's lifecycle, must be done elsewhere.
    */
-  void RegisterProcessor(Integration::Processor& processor);
+  void RegisterProcessor(Integration::Processor& processor, bool postProcessor = false);
 
   /**
    * @brief Unregister a previously registered processor from dali-core.
    * @param[in] processor the Processor to unregister
+   * @param[in] postProcessor True if the processor to be unregister is for post processor.
    */
-  void UnregisterProcessor(Integration::Processor& processor);
+  void UnregisterProcessor(Integration::Processor& processor, bool postProcessor = false);
 
   /**
    * @brief Get the list of windows created.

diff --git a/dali/internal/adaptor/common/adaptor-impl.cpp b/dali/internal/adaptor/common/adaptor-impl.cpp
index 2767044..c849f93 100644 (file)
--- a/dali/internal/adaptor/common/adaptor-impl.cpp
+++ b/dali/internal/adaptor/common/adaptor-impl.cpp
@@ -1106,14 +1106,14 @@ const LogFactoryInterface& Adaptor::GetLogFactory()
   return *mEnvironmentOptions;
 }
 
-void Adaptor::RegisterProcessor(Integration::Processor& processor)
+void Adaptor::RegisterProcessor(Integration::Processor& processor, bool postProcessor)
 {
-  GetCore().RegisterProcessor(processor);
+  GetCore().RegisterProcessor(processor, postProcessor);
 }
 
-void Adaptor::UnregisterProcessor(Integration::Processor& processor)
+void Adaptor::UnregisterProcessor(Integration::Processor& processor, bool postProcessor)
 {
-  GetCore().UnregisterProcessor(processor);
+  GetCore().UnregisterProcessor(processor, postProcessor);
 }
 
 bool Adaptor::IsMultipleWindowSupported() const

diff --git a/dali/internal/adaptor/common/adaptor-impl.h b/dali/internal/adaptor/common/adaptor-impl.h
index 7992342..b69ad05 100644 (file)
--- a/dali/internal/adaptor/common/adaptor-impl.h
+++ b/dali/internal/adaptor/common/adaptor-impl.h
@@ -442,12 +442,12 @@ public:
   /**
    * @copydoc Dali::Adaptor::RegisterProcessor
    */
-  void RegisterProcessor(Integration::Processor& processor);
+  void RegisterProcessor(Integration::Processor& processor, bool postProcessor);
 
   /**
    * @coydoc Dali::Adaptor::UnregisterProcessor
    */
-  void UnregisterProcessor(Integration::Processor& processor);
+  void UnregisterProcessor(Integration::Processor& processor, bool postProcessor);
 
   /**
    * Check MultipleWindow is supported

diff --git a/dali/internal/adaptor/common/adaptor.cpp b/dali/internal/adaptor/common/adaptor.cpp
index 31af12b..d320604 100644 (file)
--- a/dali/internal/adaptor/common/adaptor.cpp
+++ b/dali/internal/adaptor/common/adaptor.cpp
@@ -230,14 +230,14 @@ const LogFactoryInterface& Adaptor::GetLogFactory()
   return mImpl->GetLogFactory();
 }
 
-void Adaptor::RegisterProcessor(Integration::Processor& processor)
+void Adaptor::RegisterProcessor(Integration::Processor& processor, bool postProcessor)
 {
-  mImpl->RegisterProcessor(processor);
+  mImpl->RegisterProcessor(processor, postProcessor);
 }
 
-void Adaptor::UnregisterProcessor(Integration::Processor& processor)
+void Adaptor::UnregisterProcessor(Integration::Processor& processor, bool postProcessor)
 {
-  mImpl->UnregisterProcessor(processor);
+  mImpl->UnregisterProcessor(processor, postProcessor);
 }
 
 Dali::WindowContainer Adaptor::GetWindows() const