Merge "Change resize policy of favicon." into devel/master

diff --combined dali-toolkit/internal/controls/web-view/web-view-impl.cpp
index 78015c9,1205cc2..0cf97a4
--- 1/dali-toolkit/internal/controls/web-view/web-view-impl.cpp
--- 2/dali-toolkit/internal/controls/web-view/web-view-impl.cpp
+++ b/dali-toolkit/internal/controls/web-view/web-view-impl.cpp
@@@ -205,7 -205,7 +205,7 @@@ Dali::Toolkit::ImageView& WebView::GetF
      Dali::PixelData pixelData = mWebEngine.GetFavicon();
      std::string url = Dali::Toolkit::Image::GenerateUrl( pixelData );
      mFaviconView = Dali::Toolkit::ImageView::New( url );
-     mFaviconView.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
+     mFaviconView.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
      mFaviconView.SetProperty( Dali::Actor::Property::SIZE, Vector2( pixelData.GetWidth(), pixelData.GetHeight() ) );
    }
    return mFaviconView;
@@@ -524,17 -524,23 +524,17 @@@ Property::Value WebView::GetProperty( B
        }
        case Toolkit::WebView::Property::SCROLL_POSITION:
        {
 -        int x, y;
 -        impl.GetScrollPosition( x, y );
 -        value = Vector2( x, y );
 +        value = impl.GetScrollPosition();
          break;
        }
        case Toolkit::WebView::Property::SCROLL_SIZE:
        {
 -        int width, height;
 -        impl.GetScrollSize( width, height );
 -        value = Vector2( width, height );
 +        value = impl.GetScrollSize();
          break;
        }
        case Toolkit::WebView::Property::CONTENT_SIZE:
        {
 -        int width, height;
 -        impl.GetContentSize( width, height );
 -        value = Vector2( width, height );
 +        value = impl.GetContentSize();
          break;
        }
        case Toolkit::WebView::Property::TITLE:
@@@ -600,19 -606,28 +600,19 @@@ void WebView::SetScrollPosition( int x
    }
  }
  
 -void WebView::GetScrollPosition( int& x, int& y ) const
 +Dali::Vector2 WebView::GetScrollPosition() const
  {
 -  if( mWebEngine )
 -  {
 -    mWebEngine.GetScrollPosition( x, y );
 -  }
 +  return mWebEngine ? mWebEngine.GetScrollPosition() : Dali::Vector2::ZERO;
  }
  
 -void WebView::GetScrollSize( int& width, int& height ) const
 +Dali::Vector2 WebView::GetScrollSize() const
  {
 -  if( mWebEngine )
 -  {
 -    mWebEngine.GetScrollSize( width, height );
 -  }
 +  return mWebEngine ? mWebEngine.GetScrollSize() : Dali::Vector2::ZERO;
  }
  
 -void WebView::GetContentSize( int& width, int& height ) const
 +Dali::Vector2 WebView::GetContentSize() const
  {
 -  if( mWebEngine )
 -  {
 -    mWebEngine.GetContentSize( width, height );
 -  }
 +  return mWebEngine ? mWebEngine.GetContentSize() : Dali::Vector2::ZERO;
  }
  
  std::string WebView::GetTitle() const