Revert "Remove Image and NativeImage for dali2"

This reverts commit 18a19f89bbd701d39fe1ce1e33061a1070be1a0c.

Change-Id: I8b60e69b2739c1d759ce845478ca74a0cc9b885f

diff --git a/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
index ff0f3ffccdaf7b5ef9ed7e14c4d6dc3495efeb64..09d7cb33554350d628b78bea1036fa72b456efd4 100644 (file)
--- a/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
+++ b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
@@ -25,12 +25,14 @@
 #include <dali/public-api/events/touch-data.h>
 #include <dali/public-api/events/key-event.h>
 #include <dali/public-api/events/wheel-event.h>
+#include <dali/public-api/images/native-image.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/object/type-registry-helper.h>
 #include <dali/public-api/object/property-array.h>
 #include <dali-toolkit/public-api/visuals/visual-properties.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali/integration-api/debug.h>
+#include <dali/devel-api/images/texture-set-image.h>
 #include <string.h>
 #ifdef ECORE_WL2
 #include <Ecore_Wl2.h>
@@ -532,14 +534,14 @@ void WidgetView::CreateWidgetRenderer()
 {
   Dali::Any source;
   mImageSource = Dali::NativeImageSource::New( source );
-  Dali::Texture texture = Dali::Texture::New( *mImageSource );
+  Dali::NativeImage image = Dali::NativeImage::New( *mImageSource );
 
   Dali::Geometry geometry = CreateQuadGeometry();
   Dali::Shader shader = CreateShader();
   mRenderer = Dali::Renderer::New( geometry, shader );
 
   Dali::TextureSet textureSet = Dali::TextureSet::New();
-  textureSet.SetTexture( 0u, texture );
+  Dali::TextureSetImage( textureSet, 0u, image );
   mRenderer.SetTextures( textureSet );
 
   //EFL app should be pre multiplied image.
@@ -1052,12 +1054,12 @@ bool WidgetView::IsWidgetRenderer()
 void WidgetView::UpdateImageSource( tbm_surface_h source )
 {
   mImageSource = Dali::NativeImageSource::New( source );
-  Dali::Texture texture = Dali::Texture::New( *mImageSource );
+  Dali::NativeImage image = Dali::NativeImage::New( *mImageSource );
 
   if( mRenderer )
   {
     Dali::TextureSet textureSet = mRenderer.GetTextures();
-    textureSet.SetTexture( 0u, texture );
+    Dali::TextureSetImage( textureSet, 0u, image );
     mRenderer.SetProperty( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA, true );
   }
 }