fix parameter of OnFaviconReceived()

Change-Id: Ia1c4336d635780b67ed05cd896e8ceb05e6da30f
Signed-off-by: Seongjun Yim <se201.yim@samsung.com>

diff --git a/inc/FWebCtrlILoadingListener.h b/inc/FWebCtrlILoadingListener.h
index e004919..d53b17e 100755 (executable)
--- a/inc/FWebCtrlILoadingListener.h
+++ b/inc/FWebCtrlILoadingListener.h
@@ -27,6 +27,11 @@
 #include <FBaseRtIEventListener.h>
 #include <FBaseString.h>
 
+namespace Tizen { namespace Graphics
+{
+class Bitmap;
+}} // Tizen::Graphics
+
 namespace Tizen { namespace Net { namespace Http
 {
 class HttpHeader;
@@ -220,9 +225,11 @@ public:
         * If receiving this callback the once, an application can get favicon by using Tizen::Web::Controls::GetFaviconN().
         *
         * @since               2.1
+        *
+        * @param[in]   favicon                 The image
         * @see Tizen::Web::Controls::GetFaviconN()
         */
-       virtual void OnFaviconReceived(void) {}
+       virtual void OnFaviconReceived(const Tizen::Graphics::Bitmap& favicon) {}
 
 protected:
 
@@ -233,7 +240,7 @@ protected:
        //
        // @since               2.0
        //
-       virtual void ILoadingListener_Reserved2(void) {}
+       virtual void ILoadingListener_Reserved1(void) {}
 
        //
        // This method is for internal use only. Using this method can cause behavioral, security-related, and consistency-related issues in the application.
@@ -242,7 +249,7 @@ protected:
        //
        // @since               2.0
        //
-       virtual void ILoadingListener_Reserved3(void) {}
+       virtual void ILoadingListener_Reserved2(void) {}
 
        //
        // This method is for internal use only. Using this method can cause behavioral, security-related, and consistency-related issues in the application.
@@ -251,7 +258,7 @@ protected:
        //
        // @since               2.0
        //
-       virtual void ILoadingListener_Reserved4(void) {}
+       virtual void ILoadingListener_Reserved3(void) {}
 
        //
        // This method is for internal use only. Using this method can cause behavioral, security-related, and consistency-related issues in the application.
@@ -260,7 +267,7 @@ protected:
        //
        // @since               2.0
        //
-       virtual void ILoadingListener_Reserved5(void) {}
+       virtual void ILoadingListener_Reserved4(void) {}
 
 }; // ILoadingListener
 

diff --git a/inc/FWebCtrlIWebUiEventListener.h b/inc/FWebCtrlIWebUiEventListener.h
index 9662c74..c96ab9f 100755 (executable)
--- a/inc/FWebCtrlIWebUiEventListener.h
+++ b/inc/FWebCtrlIWebUiEventListener.h
@@ -116,7 +116,7 @@ protected:
        //
        // @since               2.0
        //
-       virtual void IWebUiEventListener_Reserved2(void) {};
+       virtual void IWebUiEventListener_Reserved1(void) {};
 
        //
        // This method is for internal use only. Using this method can cause behavioral, security-related, and consistency-related issues in the application.
@@ -125,7 +125,7 @@ protected:
        //
        // @since               2.0
        //
-       virtual void IWebUiEventListener_Reserved3(void) {};
+       virtual void IWebUiEventListener_Reserved2(void) {};
 
        //
        // This method is for internal use only. Using this method can cause behavioral, security-related, and consistency-related issues in the application.
@@ -134,7 +134,7 @@ protected:
        //
        // @since               2.0
        //
-       virtual void IWebUiEventListener_Reserved4(void) {};
+       virtual void IWebUiEventListener_Reserved3(void) {};
 
        //
        // This method is for internal use only. Using this method can cause behavioral, security-related, and consistency-related issues in the application.
@@ -143,7 +143,7 @@ protected:
        //
        // @since               2.0
        //
-       virtual void IWebUiEventListener_Reserved5(void) {};
+       virtual void IWebUiEventListener_Reserved4(void) {};
 }; // IWebUiEventListener
 
 }}} // Tizen::Web::Controls

diff --git a/inc/FWebCtrlIWebUiEventListenerF.h b/inc/FWebCtrlIWebUiEventListenerF.h
index 9e819f5..57b8124 100755 (executable)
--- a/inc/FWebCtrlIWebUiEventListenerF.h
+++ b/inc/FWebCtrlIWebUiEventListenerF.h
@@ -114,7 +114,7 @@ protected:
        //\r
        // @since               2.1\r
        //\r
-       virtual void IWebUiEventListenerF_Reserved2(void) {};\r
+       virtual void IWebUiEventListenerF_Reserved1(void) {};\r
 \r
        //\r
        // This method is for internal use only. Using this method can cause behavioral, security-related, and consistency-related issues in the application.\r
@@ -123,7 +123,7 @@ protected:
        //\r
        // @since               2.1\r
        //\r
-       virtual void IWebUiEventListenerF_Reserved3(void) {};\r
+       virtual void IWebUiEventListenerF_Reserved2(void) {};\r
 \r
        //\r
        // This method is for internal use only. Using this method can cause behavioral, security-related, and consistency-related issues in the application.\r
@@ -132,7 +132,7 @@ protected:
        //\r
        // @since               2.1\r
        //\r
-       virtual void IWebUiEventListenerF_Reserved4(void) {};\r
+       virtual void IWebUiEventListenerF_Reserved3(void) {};\r
 \r
        //\r
        // This method is for internal use only. Using this method can cause behavioral, security-related, and consistency-related issues in the application.\r
@@ -141,7 +141,7 @@ protected:
        //\r
        // @since               2.1\r
        //\r
-       virtual void IWebUiEventListenerF_Reserved5(void) {};\r
+       virtual void IWebUiEventListenerF_Reserved4(void) {};\r
 }; // IWebUiEventListenerF\r
 \r
 }}} // Tizen::Web::Controls\r

diff --git a/src/controls/FWebCtrl_WebImpl.cpp b/src/controls/FWebCtrl_WebImpl.cpp
index 5dd0515..c2031f8 100755 (executable)
--- a/src/controls/FWebCtrl_WebImpl.cpp
+++ b/src/controls/FWebCtrl_WebImpl.cpp
@@ -3817,7 +3817,10 @@ _WebImpl::OnHandleLoadingEvent(const IEventArg& arg)
 
        case WEB_EVENT_LOADINGLISTENER_FAVICON_RECEIVED:
        {
-               pLoadingListner->OnFaviconReceived();
+               std::unique_ptr<Bitmap> pFavicon(GetFaviconN());
+               SysTryReturn(NID_WEB_CTRL, pFavicon.get(), GetLastResult(), GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
+
+               pLoadingListner->OnFaviconReceived(*pFavicon.get());
                break;
        }