Remove NativeImage Usage

Change-Id: I6aaba9d2d3654063d0a0fd57400c08dbf610d242

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-web-engine.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-web-engine.cpp
index 5316331..5840711 100755 (executable)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-web-engine.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-web-engine.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * 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.
@@ -21,7 +21,6 @@
 #include <dali/public-api/object/any.h>
 #include <dali/public-api/object/base-object.h>
 #include <dali/public-api/adaptor-framework/native-image-source.h>
-#include <dali/public-api/images/native-image.h>
 #include <toolkit-application.h>
 
 namespace Dali

diff --git a/dali-toolkit/internal/controls/video-view/video-view-impl.h b/dali-toolkit/internal/controls/video-view/video-view-impl.h
index 3d345a3..200ab10 100755 (executable)
--- a/dali-toolkit/internal/controls/video-view/video-view-impl.h
+++ b/dali-toolkit/internal/controls/video-view/video-view-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_VIDEO_VIEW_H
 
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * 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.
@@ -20,7 +20,6 @@
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/object/property-map.h>
-#include <dali/public-api/images/native-image.h>
 #include <dali/public-api/object/property-notification.h>
 #include <dali/public-api/object/property-conditions.h>
 #include <dali/public-api/rendering/renderer.h>

diff --git a/dali-toolkit/internal/controls/web-view/web-view-impl.cpp b/dali-toolkit/internal/controls/web-view/web-view-impl.cpp
index 42139f8..90f5659 100644 (file)
--- a/dali-toolkit/internal/controls/web-view/web-view-impl.cpp
+++ b/dali-toolkit/internal/controls/web-view/web-view-impl.cpp
@@ -23,7 +23,6 @@
 #include <dali/devel-api/scripting/enum-helper.h>
 #include <dali/devel-api/scripting/scripting.h>
 #include <dali/public-api/common/stage.h>
-#include <dali/public-api/images/native-image.h>
 #include <dali/public-api/adaptor-framework/native-image-source.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/object/type-registry-helper.h>
@@ -154,7 +153,7 @@ void WebView::LoadUrl( const std::string& url )
   if( mWebEngine )
   {
     Texture texture = Dali::Texture::New( *mWebEngine.GetNativeImageSource() );
-        const std::string nativeImageUrl = Dali::Toolkit::TextureManager::AddTexture( texture );
+    const std::string nativeImageUrl = Dali::Toolkit::TextureManager::AddTexture( texture );
     mVisual = Toolkit::VisualFactory::Get().CreateVisual(
       { { Toolkit::Visual::Property::TYPE,  Toolkit::Visual::IMAGE } ,
         { Toolkit::ImageVisual::Property::URL, nativeImageUrl } } );
@@ -174,7 +173,6 @@ void WebView::LoadHTMLString( const std::string& htmlString )
   {
     Texture texture = Dali::Texture::New( *mWebEngine.GetNativeImageSource() );
     const std::string nativeImageUrl = Dali::Toolkit::TextureManager::AddTexture( texture );
-
     mVisual = Toolkit::VisualFactory::Get().CreateVisual(
       { { Toolkit::Visual::Property::TYPE,  Toolkit::Visual::IMAGE } ,
         { Toolkit::ImageVisual::Property::URL, nativeImageUrl } } );