Fixed build break

Change-Id: I1748b443b5c4cda40d4a4fc03686fe2b0f61288b

diff --git a/dali/internal/common/core-impl.cpp b/dali/internal/common/core-impl.cpp
index 1130a78..b1f4df3 100644 (file)
--- a/dali/internal/common/core-impl.cpp
+++ b/dali/internal/common/core-impl.cpp
@@ -153,31 +153,6 @@ Core::~Core()
 
   // remove (last?) reference to stage
   mStage.Reset();
-
-}
-
-Integration::ContextNotifierInterface* Core::GetContextNotifier()
-{
-  return mStage.Get();
-}
-
-void Core::RecoverFromContextLoss()
-{
-  DALI_LOG_INFO(gCoreFilter, Debug::Verbose, "Core::RecoverFromContextLoss()\n");
-
-  mStage->GetRenderTaskList().RecoverFromContextLoss(); // Re-trigger render-tasks
-}
-
-void Core::ContextCreated()
-{
-  // TODO:
-  DALI_LOG_ERROR("TODO: NOTIFY CONTEXT CREATED\n");
-}
-
-void Core::ContextDestroyed()
-{
-  // TODO:
-  DALI_LOG_ERROR("TODO: NOTIFY CONTEXT DESTROYED\n");
 }
 
 void Core::SurfaceResized( unsigned int width, unsigned int height )

diff --git a/dali/internal/common/core-impl.h b/dali/internal/common/core-impl.h
index cfe4b8c..359d107 100644 (file)
--- a/dali/internal/common/core-impl.h
+++ b/dali/internal/common/core-impl.h
@@ -21,7 +21,6 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/common/view-mode.h>
 #include <dali/public-api/object/ref-object.h>
-#include <dali/integration-api/context-notifier.h>
 #include <dali/integration-api/resource-policies.h>
 #include <dali/internal/common/owner-pointer.h>
 #include <dali/internal/event/animation/animation-playlist-declarations.h>
@@ -89,26 +88,6 @@ public:
   ~Core();
 
   /**
-   * @copydoc Dali::Integration::Core::GetContextNotifier()
-   */
-  Integration::ContextNotifierInterface* GetContextNotifier();
-
-  /**
-   * @copydoc Dali::Integration::Core::ContextCreated()
-   */
-  void ContextCreated();
-
-  /**
-   * @copydoc Dali::Integration::Core::ContextDestroyed()
-   */
-  void ContextDestroyed();
-
-  /**
-   * @copydoc Dali::Integration::Core::RecoverFromContextLoss()
-   */
-  void RecoverFromContextLoss();
-
-  /**
    * @copydoc Dali::Integration::Core::SurfaceResized(unsigned int, unsigned int)
    */
   void SurfaceResized(unsigned int width, unsigned int height);

diff --git a/dali/internal/event/common/stage-impl.cpp b/dali/internal/event/common/stage-impl.cpp
index b54e34f..ca39619 100644 (file)
--- a/dali/internal/event/common/stage-impl.cpp
+++ b/dali/internal/event/common/stage-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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.
@@ -676,17 +676,6 @@ Dali::Stage::SceneCreatedSignalType& Stage::SceneCreatedSignal()
   return mSceneCreatedSignal;
 }
 
-void Stage::NotifyContextLost()
-{
-  mContextLostSignal.Emit();
-}
-
-void Stage::NotifyContextRegained()
-{
-  mContextRegainedSignal.Emit();
-}
-
-
 void Stage::RequestRebuildDepthTree()
 {
   DALI_LOG_INFO(gLogFilter, Debug::General, "RequestRebuildDepthTree()\n");

diff --git a/dali/internal/event/common/stage-impl.h b/dali/internal/event/common/stage-impl.h
index c8b04b8..718c387 100644 (file)
--- a/dali/internal/event/common/stage-impl.h
+++ b/dali/internal/event/common/stage-impl.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_STAGE_H
 
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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,7 +23,6 @@
 #include <dali/public-api/common/stage.h>
 #include <dali/devel-api/common/stage-devel.h>
 #include <dali/public-api/object/base-object.h>
-#include <dali/integration-api/context-notifier.h>
 #include <dali/internal/common/owner-pointer.h>
 #include <dali/internal/event/actors/layer-impl.h>
 #include <dali/internal/event/common/event-thread-services.h>
@@ -67,7 +66,7 @@ class RenderTaskList;
 /**
  * Implementation of Stage
  */
-class Stage : public BaseObject, public RenderTaskDefaults, public Integration::ContextNotifierInterface, public EventThreadServices
+class Stage : public BaseObject, public RenderTaskDefaults, public EventThreadServices
 {
 public:
 
@@ -399,18 +398,6 @@ public:
    */
   static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor );
 
-private: // Implementation of ContextNotificationInterface:
-
-  /**
-   * @copydoc Dali::Integration::NotifyContextLost();
-   */
-  virtual void NotifyContextLost();
-
-  /**
-   * @copydoc Dali::Integration::NotifyContextRegained();
-   */
-  virtual void NotifyContextRegained();
-
 public: // Implementation of EventThreadServices
 
   /**

diff --git a/dali/public-api/common/stage.h b/dali/public-api/common/stage.h
index 1c77fb5..c27eaef 100644 (file)
--- a/dali/public-api/common/stage.h
+++ b/dali/public-api/common/stage.h
@@ -2,7 +2,7 @@
 #define __DALI_STAGE_H__
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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.
@@ -336,6 +336,8 @@ public:
   WheelEventSignalType& WheelEventSignal();
 
   /**
+   * @DEPRECATED_1_3.20 Not relevant for new Graphics API.
+   *
    * @brief This signal is emitted when the GL context is lost (Platform specific behaviour).
    *
    * If the application is responsible for handling context loss, it should listen to
@@ -346,11 +348,14 @@ public:
   ContextStatusSignal& ContextLostSignal();
 
   /**
+   * @DEPRECATED_1_3.20 Not relevant for new Graphics API.
+   *
    * @brief This signal is emitted when the GL context is regained (Platform specific
    * behavior).
    *
    * If the application is responsible for handling context loss, it should listen to
    * this signal and rebuild UI components on receipt.
+   * @deprecate
    * @SINCE_1_0.0
    * @return The context regained signal to connect to
    */