Changeset 121835 in webkit

Timestamp:

Jul 4, 2012 12:33:41 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL][WK2] Ewk_View should report load errors
​https://bugs.webkit.org/show_bug.cgi?id=90479

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

The Ewk_View now emits a "load,error" signal when the
main frame fails loading. Information about the error
is provided via the new Ewk_Web_Error type.

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

(ewk_view_load_error):

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

(didFailLoadWithErrorForFrame):
(ewk_view_loader_client_attach):

• UIProcess/API/efl/ewk_view_private.h:
• UIProcess/API/efl/ewk_web_error.cpp: Added.

(_Ewk_Web_Error):
(ewk_web_error_free):
(ewk_web_error_domain_get):
(ewk_web_error_url_get):
(ewk_web_error_code_get):
(ewk_web_error_description_get):
(ewk_web_error_cancellation_get):
(ewk_web_error_new):

• UIProcess/API/efl/ewk_web_error.h: Added.
• UIProcess/API/efl/ewk_web_error_private.h: Added.

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_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)
• UIProcess/API/efl/ewk_web_error.cpp (added)
• UIProcess/API/efl/ewk_web_error.h (added)
• UIProcess/API/efl/ewk_web_error_private.h (added)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-07-04  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [EFL][WK2] Ewk_View should report load errors
+        https://bugs.webkit.org/show_bug.cgi?id=90479
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        The Ewk_View now emits a "load,error" signal when the
+        main frame fails loading. Information about the error
+        is provided via the new Ewk_Web_Error type.
+
+        * PlatformEfl.cmake:
+        * UIProcess/API/efl/EWebKit2.h:
+        * UIProcess/API/efl/ewk_view.cpp:
+        (ewk_view_load_error):
+        * UIProcess/API/efl/ewk_view.h:
+        * UIProcess/API/efl/ewk_view_loader_client.cpp:
+        (didFailLoadWithErrorForFrame):
+        (ewk_view_loader_client_attach):
+        * UIProcess/API/efl/ewk_view_private.h:
+        * UIProcess/API/efl/ewk_web_error.cpp: Added.
+        (_Ewk_Web_Error):
+        (ewk_web_error_free):
+        (ewk_web_error_domain_get):
+        (ewk_web_error_url_get):
+        (ewk_web_error_code_get):
+        (ewk_web_error_description_get):
+        (ewk_web_error_cancellation_get):
+        (ewk_web_error_new):
+        * UIProcess/API/efl/ewk_web_error.h: Added.
+        * UIProcess/API/efl/ewk_web_error_private.h: Added.
+
 2012-07-03  Christophe Dumez  <christophe.dumez@intel.com>
 

trunk/Source/WebKit2/PlatformEfl.cmake

@@ -37 +37 @@
     UIProcess/API/efl/ewk_view.cpp
     UIProcess/API/efl/ewk_view_loader_client.cpp
+    UIProcess/API/efl/ewk_web_error.cpp
 
     UIProcess/cairo/BackingStoreCairo.cpp

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

@@ -32 +32 @@
 #include "ewk_intent_service.h"
 #include "ewk_view.h"
+#include "ewk_web_error.h"
 
 #endif // EWebKit2_h

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

@@ -679 +679 @@
 }
 
+/**
+ * @internal
+ * Reports load failed with error information.
+ *
+ * Emits signal: "load,error" with pointer to Ewk_Web_Error.
+ */
+void ewk_view_load_error(Evas_Object* ewkView, const Ewk_Web_Error* error)
+{
+    evas_object_smart_callback_call(ewkView, "load,error", const_cast<Ewk_Web_Error*>(error));
+}
+
+
 #if ENABLE(WEB_INTENTS_TAG)
 /**

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

@@ -29 +29 @@
  * - "intent,request,new", Ewk_Intent_Request*: reports new Web intent request.
  * - "intent,service,register", Ewk_Intent_Service*: reports new Web intent service registration.
+ * - "load,error", const Ewk_Web_Error*: reports main frame load failed.
  * - "load,progress", double*: load progress has changed (value from 0.0 to 1.0).
  * - "title,changed", const char*: title of the main frame was changed.

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

@@ -33 +33 @@
 #include "ewk_view_loader_client_private.h"
 #include "ewk_view_private.h"
+#include "ewk_web_error.h"
+#include "ewk_web_error_private.h"
 #include <wtf/text/CString.h>
 
@@ -72 +74 @@
 }
 
+static void didFailLoadWithErrorForFrame(WKPageRef page, WKFrameRef frame, WKErrorRef error, WKTypeRef, const void *clientInfo)
+{
+    if (!WKFrameIsMainFrame(frame))
+        return;
+
+    Evas_Object* ewkView = static_cast<Evas_Object*>(const_cast<void*>(clientInfo));
+    Ewk_Web_Error* ewkError = ewk_web_error_new(error);
+    ewk_view_load_error(ewkView, ewkError);
+    ewk_web_error_free(ewkError);
+}
+
 void ewk_view_loader_client_attach(WKPageRef pageRef, Evas_Object* ewkView)
 {
@@ -88 +101 @@
     loadClient.didChangeProgress = didChangeProgress;
     loadClient.didFinishProgress = didChangeProgress;
+    loadClient.didFailLoadWithErrorForFrame = didFailLoadWithErrorForFrame;
     WKPageSetPageLoaderClient(pageRef, &loadClient);
 }

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

@@ -31 +31 @@
 }
 
+typedef struct _Ewk_Web_Error Ewk_Web_Error;
 #if ENABLE(WEB_INTENTS)
 typedef struct _Ewk_Intent Ewk_Intent;
@@ -40 +41 @@
 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_load_error(Evas_Object* ewkView, const Ewk_Web_Error* error);
 void ewk_view_load_progress_changed(Evas_Object* ewkView, double progress);
 void ewk_view_title_changed(Evas_Object* ewkView, const char* title);