Merge "Clean up the code to build successfully on macOS" into devel/master

[platform/core/uifw/dali-core.git] / dali / integration-api / render-controller.h

diff --git a/dali/integration-api/render-controller.h b/dali/integration-api/render-controller.h
index 5cee933..f337dd6 100644 (file)
--- a/dali/integration-api/render-controller.h
+++ b/dali/integration-api/render-controller.h
@@ -1,60 +1,58 @@
-#ifndef __DALI_INTEGRATION_RENDER_CONTROLLER_H__
-#define __DALI_INTEGRATION_RENDER_CONTROLLER_H__
-
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+#ifndef DALI_INTEGRATION_RENDER_CONTROLLER_H
+#define DALI_INTEGRATION_RENDER_CONTROLLER_H
+
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 namespace Dali
 {
-
 namespace Integration
 {
-
 /**
  * Abstract interface for an object which controls rendering.
  * This will be informed when Dali has new content to render.
  */
-class DALI_IMPORT_API RenderController
+class RenderController
 {
 protected:
-
   /**
    * Virtual protected destructor, no deletion through this interface
    */
-  virtual ~RenderController() {}
+  virtual ~RenderController() = default;
 
 public:
-
   /**
    * Requests a future call to Dali::Integration::Core::Update().
    * This is called when Dali has new content, typically in response to Actors/Animations being added.
    * Multi-threading note: this method will be called from the main thread only.
+   * @param[in] forceUpdate true to update forcely.
    */
-  virtual void RequestUpdate() = 0;
+  virtual void RequestUpdate(bool forceUpdate) = 0;
 
   /**
    * Requests a future call to Dali::Integration::Core::ProcessEvents(), when the application is idle.
    * Multi-threading note: this method will be called from the main thread only.
+   * @param[in] forceProcess true to process events forcely.
    */
-  virtual void RequestProcessEventsOnIdle() = 0;
-
+  virtual void RequestProcessEventsOnIdle(bool forceProcess) = 0;
 };
 
 } // namespace Integration
 
 } // namespace Dali
 
-#endif // __DALI_INTEGRATION_RENDER_CONTROLLER_H__
+#endif // DALI_INTEGRATION_RENDER_CONTROLLER_H