Changeset 121732 in webkit

Timestamp:

Jul 2, 2012 11:27:10 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL][WK2] Add API to inspect a Web Intent service
​https://bugs.webkit.org/show_bug.cgi?id=90066

Patch by Christophe Dumez <Christophe Dumez> on 2012-07-02
Reviewed by Kenneth Rohde Christiansen.

Add EFL API to inspect a Web Intent Service and emit
a signal on the view when a new intent service
registers.

• PlatformEfl.cmake:
• UIProcess/API/efl/EWebKit2.h:
• UIProcess/API/efl/ewk_intent_service.cpp: Added.

(_Ewk_Intent_Service):
(ewk_intent_service_ref):
(ewk_intent_service_unref):
(ewk_intent_service_action_get):
(ewk_intent_service_type_get):
(ewk_intent_service_href_get):
(ewk_intent_service_title_get):
(ewk_intent_service_disposition_get):
(ewk_intent_service_new):

• UIProcess/API/efl/ewk_intent_service.h: Added.
• UIProcess/API/efl/ewk_intent_service_private.h: Copied from Source/WebKit2/UIProcess/API/efl/ewk_view_loader_client.cpp.
• UIProcess/API/efl/ewk_view.cpp:

(ewk_view_intent_service_register):

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

(registerIntentServiceForFrame):
(ewk_view_loader_client_attach):

• UIProcess/API/efl/ewk_view_private.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• PlatformEfl.cmake (modified) (1 diff)
• UIProcess/API/efl/EWebKit2.h (modified) (1 diff)
• UIProcess/API/efl/ewk_intent_service.cpp (added)
• UIProcess/API/efl/ewk_intent_service.h (added)
• UIProcess/API/efl/ewk_intent_service_private.h (added)
• UIProcess/API/efl/ewk_view.cpp (modified) (1 diff)
• UIProcess/API/efl/ewk_view.h (modified) (1 diff)
• UIProcess/API/efl/ewk_view_loader_client.cpp (modified) (3 diffs)
• UIProcess/API/efl/ewk_view_private.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-07-02  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [EFL][WK2] Add API to inspect a Web Intent service
+        https://bugs.webkit.org/show_bug.cgi?id=90066
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Add EFL API to inspect a Web Intent Service and emit
+        a signal on the view when a new intent service
+        registers.
+
+        * PlatformEfl.cmake:
+        * UIProcess/API/efl/EWebKit2.h:
+        * UIProcess/API/efl/ewk_intent_service.cpp: Added.
+        (_Ewk_Intent_Service):
+        (ewk_intent_service_ref):
+        (ewk_intent_service_unref):
+        (ewk_intent_service_action_get):
+        (ewk_intent_service_type_get):
+        (ewk_intent_service_href_get):
+        (ewk_intent_service_title_get):
+        (ewk_intent_service_disposition_get):
+        (ewk_intent_service_new):
+        * UIProcess/API/efl/ewk_intent_service.h: Added.
+        * UIProcess/API/efl/ewk_intent_service_private.h: Copied from Source/WebKit2/UIProcess/API/efl/ewk_view_loader_client.cpp.
+        * UIProcess/API/efl/ewk_view.cpp:
+        (ewk_view_intent_service_register):
+        * UIProcess/API/efl/ewk_view.h:
+        * UIProcess/API/efl/ewk_view_loader_client.cpp:
+        (registerIntentServiceForFrame):
+        (ewk_view_loader_client_attach):
+        * UIProcess/API/efl/ewk_view_private.h:
+
 2012-07-02  Christophe Dumez  <christophe.dumez@intel.com>
 

trunk/Source/WebKit2/PlatformEfl.cmake

@@ -34 +34 @@
     UIProcess/API/efl/ewk_context.cpp
     UIProcess/API/efl/ewk_intent.cpp
+    UIProcess/API/efl/ewk_intent_service.cpp
     UIProcess/API/efl/ewk_view.cpp
     UIProcess/API/efl/ewk_view_loader_client.cpp

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

@@ -30 +30 @@
 #include "ewk_context.h"
 #include "ewk_intent.h"
+#include "ewk_intent_service.h"
 #include "ewk_view.h"
 

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

@@ -644 +644 @@
 }
 
+#if ENABLE(WEB_INTENTS_TAG)
+/**
+ * @internal
+ * The view received a new intent service registration.
+ *
+ * Emits signal: "intent,service,register" with pointer to a Ewk_Intent_Service.
+ */
+void ewk_view_intent_service_register(Evas_Object* ewkView, const Ewk_Intent_Service* ewkIntentService)
+{
+    evas_object_smart_callback_call(ewkView, "intent,service,register", const_cast<Ewk_Intent_Service*>(ewkIntentService));
+}
+#endif // ENABLE(WEB_INTENTS_TAG)
+
 WebPageProxy* ewk_view_page_get(const Evas_Object* ewkView)
 {

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

@@ -28 +28 @@
  *
  * - "intent,request,new", Ewk_Intent_Request*: reports new Web intent request.
+ * - "intent,service,register", Ewk_Intent_Service*: reports new Web intent service registration.
  * - "title,changed", const char*: title of the main frame was changed.
  */

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

@@ -29 +29 @@
 #include "ewk_intent.h"
 #include "ewk_intent_private.h"
+#include "ewk_intent_service.h"
+#include "ewk_intent_service_private.h"
 #include "ewk_view_loader_client_private.h"
 #include "ewk_view_private.h"
@@ -54 +56 @@
 #endif
 
+#if ENABLE(WEB_INTENTS_TAG)
+static void registerIntentServiceForFrame(WKPageRef page, WKFrameRef frame, WKIntentServiceInfoRef serviceInfo, const void *clientInfo)
+{
+    Evas_Object* ewkView = static_cast<Evas_Object*>(const_cast<void*>(clientInfo));
+    Ewk_Intent_Service* ewkIntentService = ewk_intent_service_new(serviceInfo);
+    ewk_view_intent_service_register(ewkView, ewkIntentService);
+    ewk_intent_service_unref(ewkIntentService);
+}
+#endif
+
 void ewk_view_loader_client_attach(WKPageRef pageRef, Evas_Object* ewkView)
 {
@@ -64 +76 @@
     loadClient.didReceiveIntentForFrame = didReceiveIntentForFrame;
 #endif
+#if ENABLE(WEB_INTENTS_TAG)
+    loadClient.registerIntentServiceForFrame = registerIntentServiceForFrame;
+#endif
     WKPageSetPageLoaderClient(pageRef, &loadClient);
 }

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

@@ -34 +34 @@
 typedef struct _Ewk_Intent Ewk_Intent;
 #endif
+#if ENABLE(WEB_INTENTS_TAG)
+typedef struct _Ewk_Intent_Service Ewk_Intent_Service;
+#endif
 
 void ewk_view_display(Evas_Object* ewkView, const WebCore::IntRect& rect);
@@ -44 +47 @@
 void ewk_view_intent_request_new(Evas_Object* ewkView, const Ewk_Intent* ewkIntent);
 #endif
+#if ENABLE(WEB_INTENTS_TAG)
+void ewk_view_intent_service_register(Evas_Object* ewkView, const Ewk_Intent_Service* ewkIntentService);
+#endif
 
 WebKit::WebPageProxy* ewk_view_page_get(const Evas_Object* ewkView);