Changeset 120442 in webkit

Timestamp:

Jun 15, 2012, 5:16:55 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL][WK2] Add title support to Ewk_View
​https://bugs.webkit.org/show_bug.cgi?id=89095

Patch by Christophe Dumez <Christophe Dumez> on 2012-06-15
Reviewed by Kenneth Rohde Christiansen.

Source/WebKit2:

Add a method to get the title of the main frame in
an Ewk_View. A "title,changed" signal is now emitted
on the view to notify clients that the main frame
title was changed.

• PlatformEfl.cmake:
• UIProcess/API/efl/ewk_view.cpp:

(_Ewk_View_Private_Data):
(_ewk_view_priv_del):
(ewk_view_base_add):
(ewk_view_title_get):
(ewk_view_title_changed):

• UIProcess/API/efl/ewk_view.h:
• UIProcess/API/efl/ewk_view_loader_client.cpp: Added.

(didReceiveTitleForFrame):
(ewk_view_loader_client_attach):

• UIProcess/API/efl/ewk_view_loader_client_private.h: Added.
• UIProcess/API/efl/ewk_view_private.h:

Tools:

Update the MiniBrowser so it listens for the "title,change"
signal on the view and keeps the browser window title
up-to-date.

• MiniBrowser/efl/main.c:

(on_title_changed):
(browserCreate):

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/PlatformEfl.cmake (modified) (1 diff)
• Source/WebKit2/UIProcess/API/efl/ewk_view.cpp (modified) (5 diffs)
• Source/WebKit2/UIProcess/API/efl/ewk_view.h (modified) (2 diffs)
• Source/WebKit2/UIProcess/API/efl/ewk_view_loader_client.cpp (added)
• Source/WebKit2/UIProcess/API/efl/ewk_view_loader_client_private.h (added)
• Source/WebKit2/UIProcess/API/efl/ewk_view_private.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/MiniBrowser/efl/main.c (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-06-15  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [EFL][WK2] Add title support to Ewk_View
+        https://bugs.webkit.org/show_bug.cgi?id=89095
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Add a method to get the title of the main frame in
+        an Ewk_View. A "title,changed" signal is now emitted
+        on the view to notify clients that the main frame
+        title was changed.
+
+        * PlatformEfl.cmake:
+        * UIProcess/API/efl/ewk_view.cpp:
+        (_Ewk_View_Private_Data):
+        (_ewk_view_priv_del):
+        (ewk_view_base_add):
+        (ewk_view_title_get):
+        (ewk_view_title_changed):
+        * UIProcess/API/efl/ewk_view.h:
+        * UIProcess/API/efl/ewk_view_loader_client.cpp: Added.
+        (didReceiveTitleForFrame):
+        (ewk_view_loader_client_attach):
+        * UIProcess/API/efl/ewk_view_loader_client_private.h: Added.
+        * UIProcess/API/efl/ewk_view_private.h:
+
 2012-06-15  Christophe Dumez  <christophe.dumez@intel.com>
 

trunk/Source/WebKit2/PlatformEfl.cmake

@@ -32 +32 @@
     UIProcess/API/efl/ewk_context.cpp
     UIProcess/API/efl/ewk_view.cpp
+    UIProcess/API/efl/ewk_view_loader_client.cpp
 
     UIProcess/cairo/BackingStoreCairo.cpp

trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp

@@ -31 +31 @@
 #include "ewk_context.h"
 #include "ewk_context_private.h"
+#include "ewk_view_loader_client_private.h"
 #include "ewk_view_private.h"
 #include <wtf/text/CString.h>
@@ -42 +43 @@
     OwnPtr<PageClientImpl> pageClient;
     const char* uri;
+    const char* title;
 };
 
@@ -269 +271 @@
     priv->pageClient = nullptr;
     eina_stringshare_del(priv->uri);
+    eina_stringshare_del(priv->title);
     free(priv);
 }
@@ -490 +493 @@
 
     priv->pageClient = PageClientImpl::create(toImpl(contextRef), toImpl(pageGroupRef), ewkView);
+    ewk_view_loader_client_attach(toAPI(priv->pageClient->page()), ewkView);
 
     return ewkView;
@@ -541 +545 @@
     WKPageStopLoading(toAPI(priv->pageClient->page()));
     return true;
+}
+
+const char* ewk_view_title_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, 0);
+    EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, 0);
+
+    CString title = priv->pageClient->page()->pageTitle().utf8();
+    eina_stringshare_replace(&priv->title, title.data());
+
+    return priv->title;
+}
+
+/**
+ * @internal
+ * The view title was changed by the frame loader.
+ *
+ * Emits signal: "title,changed" with pointer to new title string.
+ */
+void ewk_view_title_changed(Evas_Object* ewkView, const char* title)
+{
+    evas_object_smart_callback_call(ewkView, "title,changed", const_cast<char*>(title));
 }
 

trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.h

@@ -24 +24 @@
  *
  * This object provides view related APIs of WebKit2 to EFL object.
+ *
+ * The following signals (see evas_object_smart_callback_add()) are emitted:
+ *
+ * - "title,changed", const char*: title of the main frame was changed.
  */
 
@@ -226 +230 @@
 EAPI Eina_Bool    ewk_view_forward_possible(Evas_Object *o);
 
+/**
+ * Gets the current title of the main frame.
+ *
+ * It returns an internal string and should not
+ * be modified. The string is guaranteed to be stringshared.
+ *
+ * @param o view object to get current title
+ *
+ * @return current title on success or @c 0 on failure
+ */
+EAPI const char *ewk_view_title_get(const Evas_Object *o);
+
 #ifdef __cplusplus
 }

trunk/Source/WebKit2/UIProcess/API/efl/ewk_view_private.h

@@ -33 +33 @@
 void ewk_view_display(Evas_Object* ewkView, const WebCore::IntRect& rect);
 void ewk_view_image_data_set(Evas_Object* ewkView, void* imageData, const WebCore::IntSize& size);
+void ewk_view_title_changed(Evas_Object* ewkView, const char* title);
 
 Evas_Object* ewk_view_base_add(Evas* canvas, WKContextRef, WKPageGroupRef);

trunk/Tools/ChangeLog

@@ +1 @@
+2012-06-15  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [EFL][WK2] Add title support to Ewk_View
+        https://bugs.webkit.org/show_bug.cgi?id=89095
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Update the MiniBrowser so it listens for the "title,change"
+        signal on the view and keeps the browser window title
+        up-to-date.
+
+        * MiniBrowser/efl/main.c:
+        (on_title_changed):
+        (browserCreate):
+
 2012-06-15  Christophe Dumez  <christophe.dumez@intel.com>
 

trunk/Tools/MiniBrowser/efl/main.c

@@ -87 +87 @@
 }
 
+static void
+on_title_changed(void *user_data, Evas_Object *webview, void *event_info)
+{
+    MiniBrowser *app = (MiniBrowser *)user_data;
+    const char *title = (const char *)event_info;
+
+    ecore_evas_title_set(app->ee, title);
+}
+
 static MiniBrowser *browserCreate(const char *url)
 {
@@ -112 +121 @@
     app->browser = ewk_view_add(app->evas);
     evas_object_name_set(app->browser, "browser");
+
+    evas_object_smart_callback_add(app->browser, "title,changed", on_title_changed, app);
 
     evas_object_event_callback_add(app->browser, EVAS_CALLBACK_KEY_DOWN, on_key_down, app);