Fix compile error. Non initialized variable.

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / web-view / web-view-impl.cpp

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..80314dc 100644 (file)
--- a/dali-toolkit/internal/controls/web-view/web-view-impl.cpp
+++ b/dali-toolkit/internal/controls/web-view/web-view-impl.cpp
@@ -22,8 +22,7 @@
 #include <cstring>
 #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/devel-api/common/stage.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>
@@ -32,6 +31,7 @@
 #include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/image-loader/texture-manager.h>
 #include <dali-toolkit/internal/visuals/visual-factory-impl.h>
+#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
 
 namespace Dali
 {
@@ -137,7 +137,7 @@ Toolkit::WebView WebView::New( const std::string& locale, const std::string& tim
 
 void WebView::OnInitialize()
 {
-  Self().SetKeyboardFocusable( true );
+  Self().SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true );
   Self().TouchSignal().Connect( this, &WebView::OnTouchEvent );
 
   if( mWebEngine )
@@ -154,7 +154,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 +174,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 } } );
@@ -520,7 +519,7 @@ Property::Value WebView::GetProperty( BaseObject* object, Property::Index proper
   return value;
 }
 
-bool WebView::OnTouchEvent( Actor actor, const Dali::TouchData& touch )
+bool WebView::OnTouchEvent( Actor actor, const Dali::TouchEvent& touch )
 {
   bool result = false;