WebEngine::GetNativeImageSource return NativeImageSourcePtr

NativeImageSource --> NativeImageInterface is simple valid job.
NativeImageInterface --> NativeImageSource is not simple and expensive job.

WebEngine / WebPlugin defined at dali-adaptor/devel-api and
NativeImageSource defined at dali-adaptor/public-api.
So there is no reason to convert NativeImageSource to NativeImageInterface.

Change-Id: Iae96e3b50ece16fcc6b17723b174a26c454cdddc
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>

diff --git a/dali/devel-api/adaptor-framework/web-engine-plugin.h b/dali/devel-api/adaptor-framework/web-engine-plugin.h
index 5ac59fd..a15a614 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine-plugin.h
+++ b/dali/devel-api/adaptor-framework/web-engine-plugin.h
@@ -21,13 +21,14 @@
 // EXTERNAL INCLUDES
 #include <functional>
 #include <memory>
+#include <dali/public-api/images/native-image-interface.h>
+#include <dali/public-api/math/rect.h>
+#include <dali/public-api/signals/dali-signal.h>
 
 // INTERNAL INCLUDES
+#include <dali/public-api/adaptor-framework/native-image-source.h>
 #include <dali/devel-api/adaptor-framework/web-engine-hit-test.h>
 #include <dali/devel-api/common/bitwise-enum.h>
-#include <dali/public-api/images/native-image-interface.h>
-#include <dali/public-api/math/rect.h>
-#include <dali/public-api/signals/dali-signal.h>
 
 namespace Dali
 {
@@ -282,7 +283,7 @@ public:
   /**
    * @brief Get image to render.
    */
-  virtual NativeImageInterfacePtr GetNativeImageSource() = 0;
+  virtual NativeImageSourcePtr GetNativeImageSource() = 0;
 
   /**
    * @brief Return the URL of the Web.

diff --git a/dali/devel-api/adaptor-framework/web-engine.cpp b/dali/devel-api/adaptor-framework/web-engine.cpp
index db92561..3c1cf41 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine.cpp
+++ b/dali/devel-api/adaptor-framework/web-engine.cpp
@@ -91,7 +91,7 @@ void WebEngine::Destroy()
   GetImplementation(*this).Destroy();
 }
 
-NativeImageInterfacePtr WebEngine::GetNativeImageSource()
+NativeImageSourcePtr WebEngine::GetNativeImageSource()
 {
   return GetImplementation(*this).GetNativeImageSource();
 }

diff --git a/dali/devel-api/adaptor-framework/web-engine.h b/dali/devel-api/adaptor-framework/web-engine.h
index 7bd2ea2..2368ebc 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine.h
+++ b/dali/devel-api/adaptor-framework/web-engine.h
@@ -114,7 +114,7 @@ public:
   /**
    * @brief Get native image source to render.
    */
-  NativeImageInterfacePtr GetNativeImageSource();
+  NativeImageSourcePtr GetNativeImageSource();
 
   /**
    * @brief Get settings of WebEngine.

diff --git a/dali/internal/web-engine/common/web-engine-impl.cpp b/dali/internal/web-engine/common/web-engine-impl.cpp
index 9afe674..2388aa7 100755 (executable)
--- a/dali/internal/web-engine/common/web-engine-impl.cpp
+++ b/dali/internal/web-engine/common/web-engine-impl.cpp
@@ -185,7 +185,7 @@ void WebEngine::Destroy()
   mPlugin->Destroy();
 }
 
-Dali::NativeImageInterfacePtr WebEngine::GetNativeImageSource()
+Dali::NativeImageSourcePtr WebEngine::GetNativeImageSource()
 {
   return mPlugin->GetNativeImageSource();
 }

diff --git a/dali/internal/web-engine/common/web-engine-impl.h b/dali/internal/web-engine/common/web-engine-impl.h
index 73e311b..39e9e59 100755 (executable)
--- a/dali/internal/web-engine/common/web-engine-impl.h
+++ b/dali/internal/web-engine/common/web-engine-impl.h
@@ -72,7 +72,7 @@ public:
   /**
    * @copydoc Dali::WebEngine::GetNativeImageSource()
    */
-  Dali::NativeImageInterfacePtr GetNativeImageSource();
+  Dali::NativeImageSourcePtr GetNativeImageSource();
 
   /**
    * @copydoc Dali::WebEngine::GetSettings()