Revert deleting webview title callback 95/90795/2
authorMaciej Skrzypkowski <m.skrzypkows@samsung.com>
Tue, 4 Oct 2016 08:52:40 +0000 (10:52 +0200)
committerMaciej Skrzypkowski <m.skrzypkows@samsung.com>
Wed, 5 Oct 2016 08:26:29 +0000 (01:26 -0700)
[Issue]        http://suprem.sec.samsung.net/jira/browse/TWF-2242
[Problem]      Title was not changed
[Solution]     Reverted mistakenly deleted callback in WebView
[Verify]       Open few tabs, check their titles in tab manager.
               Check if proper title is set while adding bookmark.

Change-Id: Idecf175f502c8fa47610a044cb847bff1a3b90f8
Signed-off-by: Maciej Skrzypkowski <m.skrzypkows@samsung.com>
services/WebEngineService/WebView.cpp
services/WebEngineService/WebView.h

index 2d4b665377a1162f5342b55062a5478f1c0ee1d0..8ecd30e1b4bcfc94701de8e8074de555907a9c31 100755 (executable)
@@ -208,6 +208,7 @@ void WebView::registerCallbacks()
     evas_object_smart_callback_add(m_ewkView, "load,progress", __loadProgress, this);
     evas_object_smart_callback_add(m_ewkView, "load,error", __loadError, this);
 
+    evas_object_smart_callback_add(m_ewkView, "title,changed", __titleChanged, this);
     evas_object_smart_callback_add(m_ewkView, "url,changed", __urlChanged, this);
     evas_object_smart_callback_add(m_ewkView, "back,forward,list,changed", __backForwardListChanged, this);
 
@@ -245,6 +246,7 @@ void WebView::unregisterCallbacks()
     evas_object_smart_callback_del_full(m_ewkView, "load,progress", __loadProgress, this);
     evas_object_smart_callback_del_full(m_ewkView, "load,error", __loadError, this);
 
+    evas_object_smart_callback_del_full(m_ewkView, "title,changed", __titleChanged, this);
     evas_object_smart_callback_del_full(m_ewkView, "url,changed", __urlChanged, this);
     evas_object_smart_callback_del_full(m_ewkView, "back,forward,list,changed", __backForwardListChanged, this);
 
@@ -1050,6 +1052,14 @@ void WebView::__loadError(void* data, Evas_Object * obj, void* ewkError)
     }
 }
 
+void WebView::__titleChanged(void * data, Evas_Object * obj, void * /* event_info */)
+{
+    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
+
+    auto self = reinterpret_cast<WebView *>(data);
+    self->m_title = fromChar(ewk_view_title_get(obj));
+}
+
 void WebView::__urlChanged(void * data, Evas_Object * /* obj */, void * /* event_info */)
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
index 1e763c5f4889e056a91ecdec19878a3c12087df4..57cc3275a2d67aef9bb6761a5bc321178dbe9e29 100644 (file)
@@ -328,6 +328,7 @@ private:
     static void __loadProgress(void * data, Evas_Object * obj, void * event_info);
     static void __loadError(void* data, Evas_Object* obj, void *ewkError);
 
+    static void __titleChanged(void * data, Evas_Object * obj, void * event_info);
     static void __urlChanged(void * data, Evas_Object * obj, void * event_info);
     static void __backForwardListChanged(void * data, Evas_Object * obj, void * event_info);