Changeset 62787 in webkit

Timestamp:

Jul 8, 2010 7:37:47 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-07-08 Lucas De Marchi <​lucas.demarchi@profusion.mobi>

Reviewed by Kenneth Rohde Christiansen.

[EFL] Implement several notification hooks in FrameLoaderClient.
We just notify browser, making the appropriate type conversions about
the events occurring in WebCore.
​https://bugs.webkit.org/show_bug.cgi?id=41005

• efl/WebCoreSupport/FrameLoaderClientEfl.cpp: (WebCore::FrameLoaderClientEfl::dispatchWillSendRequest): alloc 2 new wrapper structures in stack in order to give client the opportunity to change parameters. Then, call the function it defines. (WebCore::FrameLoaderClientEfl::assignIdentifierToInitialRequest): (WebCore::FrameLoaderClientEfl::didPerformFirstNavigation): notify client. (WebCore::FrameLoaderClientEfl::saveViewStateToItem): notify client. (WebCore::FrameLoaderClientEfl::restoreViewState): notify client. (WebCore::FrameLoaderClientEfl::dispatchDidChangeLocationWithinPage): notify browser that the url changed. (WebCore::FrameLoaderClientEfl::dispatchDidReceiveIcon): notify browser. (WebCore::FrameLoaderClientEfl::dispatchDidStartProvisionalLoad): notify browser. (WebCore::FrameLoaderClientEfl::dispatchDidFinishDocumentLoad): notify browser. (WebCore::FrameLoaderClientEfl::dispatchDidFirstLayout): norify browser. (WebCore::FrameLoaderClientEfl::dispatchDidFirstVisuallyNonEmptyLayout): notify browser. (WebCore::FrameLoaderClientEfl::dispatchShow): notify browser.
• efl/ewk/ewk_frame.cpp: (ewk_frame_request_will_send): emit signal notifying browser. (ewk_frame_request_assign_identifier): emit signal notifying browser. (ewk_frame_did_perform_first_navigation): emit signal notifying browser. (ewk_frame_view_state_save): emit signal notifying browser. (ewk_frame_load_provisional): emit signal notifying browser. (ewk_frame_load_firstlayout_finished): emit signal notifying browser. (ewk_frame_load_firstlayout_nonempty_finished): emit signal notifying browser. (ewk_frame_load_document_finished): emit signal notifying browser.
• efl/ewk/ewk_frame.h: update documentation about signals being sent and implement wrapper struct for ResourceRequest.
• efl/ewk/ewk_private.h: export private functions.

Location:

trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• efl/WebCoreSupport/FrameLoaderClientEfl.cpp (modified) (7 diffs)
• efl/ewk/ewk_frame.cpp (modified) (3 diffs)
• efl/ewk/ewk_frame.h (modified) (3 diffs)
• efl/ewk/ewk_private.h (modified) (2 diffs)

trunk/WebKit/ChangeLog

@@ +1 @@
+2010-07-08  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [EFL] Implement several notification hooks in FrameLoaderClient.
+        We just notify browser, making the appropriate type conversions about
+        the events occurring in WebCore.
+        https://bugs.webkit.org/show_bug.cgi?id=41005
+
+        * efl/WebCoreSupport/FrameLoaderClientEfl.cpp:
+        (WebCore::FrameLoaderClientEfl::dispatchWillSendRequest): alloc 2 new
+        wrapper structures in stack in order to give client the opportunity to
+        change parameters. Then, call the function it defines.
+        (WebCore::FrameLoaderClientEfl::assignIdentifierToInitialRequest):
+        (WebCore::FrameLoaderClientEfl::didPerformFirstNavigation): notify
+        client.
+        (WebCore::FrameLoaderClientEfl::saveViewStateToItem): notify client.
+        (WebCore::FrameLoaderClientEfl::restoreViewState): notify client.
+        (WebCore::FrameLoaderClientEfl::dispatchDidChangeLocationWithinPage):
+        notify browser that the url changed.
+        (WebCore::FrameLoaderClientEfl::dispatchDidReceiveIcon): notify
+        browser.
+        (WebCore::FrameLoaderClientEfl::dispatchDidStartProvisionalLoad):
+        notify browser.
+        (WebCore::FrameLoaderClientEfl::dispatchDidFinishDocumentLoad): notify
+        browser.
+        (WebCore::FrameLoaderClientEfl::dispatchDidFirstLayout): norify
+        browser.
+        (WebCore::FrameLoaderClientEfl::dispatchDidFirstVisuallyNonEmptyLayout):
+        notify browser.
+        (WebCore::FrameLoaderClientEfl::dispatchShow): notify browser.
+        * efl/ewk/ewk_frame.cpp:
+        (ewk_frame_request_will_send): emit signal notifying browser.
+        (ewk_frame_request_assign_identifier): emit signal notifying browser.
+        (ewk_frame_did_perform_first_navigation): emit signal notifying browser.
+        (ewk_frame_view_state_save): emit signal notifying browser.
+        (ewk_frame_load_provisional): emit signal notifying browser.
+        (ewk_frame_load_firstlayout_finished): emit signal notifying browser.
+        (ewk_frame_load_firstlayout_nonempty_finished): emit signal notifying browser.
+        (ewk_frame_load_document_finished): emit signal notifying browser.
+        * efl/ewk/ewk_frame.h: update documentation about signals being sent
+        and implement wrapper struct for ResourceRequest.
+        * efl/ewk/ewk_private.h: export private functions.
+
 2010-07-08  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
 

trunk/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp

@@ -252 +252 @@
 }
 
-void FrameLoaderClientEfl::dispatchWillSendRequest(DocumentLoader*, unsigned long, ResourceRequest&, const ResourceResponse&)
-{
-    notImplemented();
+void FrameLoaderClientEfl::dispatchWillSendRequest(DocumentLoader* loader, unsigned long identifier, ResourceRequest& coreRequest, const ResourceResponse& coreResponse)
+{
+    CString url = coreRequest.url().prettyURL().utf8();
+    DBG("Resource url=%s", url.data());
+
+    Ewk_Frame_Resource_Request request = { 0, identifier };
+    Ewk_Frame_Resource_Request orig = request; /* Initialize const fields. */
+
+    orig.url = request.url = url.data();
+
+    ewk_frame_request_will_send(m_frame, &request);
+
+    if (request.url != orig.url) {
+        coreRequest.setURL(KURL(KURL(), request.url));
+
+        // Calling client might have changed our url pointer.
+        // Free the new allocated string.
+        free(const_cast<char*>(request.url));
+    }
 }
 
@@ -263 +279 @@
 }
 
-void FrameLoaderClientEfl::assignIdentifierToInitialRequest(unsigned long identifier, DocumentLoader*, const ResourceRequest&)
-{
-    notImplemented();
+void FrameLoaderClientEfl::assignIdentifierToInitialRequest(unsigned long identifier, DocumentLoader*, const ResourceRequest& coreRequest)
+{
+    CString url = coreRequest.url().prettyURL().utf8();
+    DBG("Resource url=%s", url.data());
+
+    Ewk_Frame_Resource_Request request = { 0, identifier };
+    ewk_frame_request_assign_identifier(m_frame, &request);
 }
 
@@ -424 +444 @@
 void FrameLoaderClientEfl::didPerformFirstNavigation() const
 {
-    notImplemented();
+    ewk_frame_did_perform_first_navigation(m_frame);
 }
 
@@ -459 +479 @@
 }
 
-void FrameLoaderClientEfl::saveViewStateToItem(HistoryItem*)
-{
-    notImplemented();
+void FrameLoaderClientEfl::saveViewStateToItem(HistoryItem* item)
+{
+    ewk_frame_view_state_save(m_frame, item);
 }
 
 void FrameLoaderClientEfl::restoreViewState()
 {
-    notImplemented();
+    ASSERT(m_frame);
+    ASSERT(m_view);
+
+    ewk_view_restore_state(m_view, m_frame);
 }
 
@@ -545 +568 @@
 void FrameLoaderClientEfl::dispatchDidChangeLocationWithinPage()
 {
-    notImplemented();
+    ewk_frame_uri_changed(m_frame);
+
+    if (ewk_view_frame_main_get(m_view) != m_frame)
+        return;
+    ewk_view_uri_changed(m_view);
 }
 
@@ -555 +582 @@
 void FrameLoaderClientEfl::dispatchDidReceiveIcon()
 {
+    /* report received favicon only for main frame. */
+    if (ewk_view_frame_main_get(m_view) != m_frame)
+        return;
+
+    ewk_view_frame_main_icon_received(m_view);
 }
 
 void FrameLoaderClientEfl::dispatchDidStartProvisionalLoad()
 {
+    ewk_frame_load_provisional(m_frame);
+    if (ewk_view_frame_main_get(m_view) == m_frame)
+        ewk_view_load_provisional(m_view);
 }
 
@@ -592 +627 @@
 void FrameLoaderClientEfl::dispatchDidFinishDocumentLoad()
 {
-    notImplemented();
+    ewk_frame_load_document_finished(m_frame);
 }
 
 void FrameLoaderClientEfl::dispatchDidFirstLayout()
 {
-    // emit m_frame->initialLayoutCompleted();
     m_initLayoutCompleted = true;
+    ewk_frame_load_firstlayout_finished(m_frame);
 }
 
 void FrameLoaderClientEfl::dispatchDidFirstVisuallyNonEmptyLayout()
 {
-    notImplemented();
+    ewk_frame_load_firstlayout_nonempty_finished(m_frame);
 }
 
 void FrameLoaderClientEfl::dispatchShow()
 {
-    notImplemented();
+    ewk_view_load_show(m_view);
 }
 

trunk/WebKit/efl/ewk/ewk_frame.cpp

@@ -32 +32 @@
 #include "FrameView.h"
 #include "HTMLPlugInElement.h"
+#include "HistoryItem.h"
 #include "HitTestResult.h"
 #include "KURL.h"
@@ -1634 +1635 @@
 /**
  * @internal
+ * Reports a resource will be requested. User may override behavior of webkit by
+ * changing values in @param request.
+ *
+ * @param o Frame.
+ * @param request Request details that user may override. Whenever values on
+ * this struct changes, it must be properly malloc'd as it will be freed
+ * afterwards.
+ *
+ * Emits signal: "resource,request,willsend"
+ */
+void ewk_frame_request_will_send(Evas_Object *o, Ewk_Frame_Resource_Request *request)
+{
+    evas_object_smart_callback_call(o, "resource,request,willsend", request);
+}
+
+/**
+ * @internal
+ * Reports that there's a new resource.
+ *
+ * @param o Frame.
+ * @param request New request details. No changes are allowed to fields.
+ *
+ * Emits signal: "resource,request,new"
+ */
+void ewk_frame_request_assign_identifier(Evas_Object *o, const Ewk_Frame_Resource_Request *request)
+{
+    evas_object_smart_callback_call(o, "resource,request,new", (void *)request);
+}
+
+/**
+ * @internal
+ * Reports that first navigation occurred
+ *
+ * @param o Frame.
+ *
+ * Emits signal: "navigation,first"
+ */
+void ewk_frame_did_perform_first_navigation(Evas_Object *o)
+{
+    evas_object_smart_callback_call(o, "navigation,first", 0);
+}
+
+/**
+ * @internal
+ * Reports frame will be saved to current state
+ *
+ * @param o Frame.
+ * @param item History item to save details to.
+ *
+ * Emits signal: "state,save"
+ */
+void ewk_frame_view_state_save(Evas_Object *o, WebCore::HistoryItem* item)
+{
+    const char *title = ewk_frame_title_get(o);
+    const char *uri = ewk_frame_uri_get(o);
+
+    item->setTitle(WebCore::String::fromUTF8(title));
+    item->setURLString(WebCore::String::fromUTF8(uri));
+
+    evas_object_smart_callback_call(o, "state,save", 0);
+}
+
+/**
+ * @internal
  * Reports the frame started loading something.
  *
@@ -1649 +1714 @@
     if (main_frame == o)
         ewk_view_frame_main_load_started(sd->view);
+}
+
+/**
+ * @internal
+ * Reports the frame started provisional load.
+ *
+ * @param o Frame.
+ *
+ * Emits signal: "load,provisional" with no parameters.
+ */
+void ewk_frame_load_provisional(Evas_Object* o)
+{
+    evas_object_smart_callback_call(o, "load,provisional", 0);
+}
+
+/**
+ * @internal
+ * Reports the frame finished first layout.
+ *
+ * @param o Frame.
+ *
+ * Emits signal: "load,firstlayout,finished" with no parameters.
+ */
+void ewk_frame_load_firstlayout_finished(Evas_Object *o)
+{
+    evas_object_smart_callback_call(o, "load,firstlayout,finished", 0);
+}
+
+/**
+ * @internal
+ * Reports the frame finished first non empty layout.
+ *
+ * @param o Frame.
+ *
+ * Emits signal: "load,nonemptylayout,finished" with no parameters.
+ */
+void ewk_frame_load_firstlayout_nonempty_finished(Evas_Object *o)
+{
+    evas_object_smart_callback_call(o, "load,nonemptylayout,finished", 0);
+}
+
+/**
+ * @internal
+ * Reports the loading of a document has finished on frame.
+ *
+ * @param o Frame.
+ *
+ * Emits signal: "load,document,finished" with no parameters.
+ */
+void ewk_frame_load_document_finished(Evas_Object *o)
+{
+    evas_object_smart_callback_call(o, "load,document,finished", 0);
 }
 

trunk/WebKit/efl/ewk/ewk_frame.h

@@ -49 +49 @@
  *  - "title,changed", const char*: title of the main frame changed.
  *  - "uri,changed", const char*: uri of the main frame changed.
+ *  - "load,document,finished", void: loading of a document has
+ *    finished on this frame.
+ *  - "load,nonemptylayout,finished", void: frame finished first
+ *    non-empty layout.
  *  - "load,started", void: frame started loading.
  *  - "load,progress", double*: load progress changed (overall value
@@ -55 +59 @@
  *    finished and as argument @c NULL if successfully or pointer to
  *    structure defining the error.
+ *  - "load,provisional", void: frame started provisional load.
+ *  - "load,firstlayout,finished", void: frame finished first layout.
  *  - "load,error", const Ewk_Frame_Load_Error*: reports load failed
  *    and as argument a pointer to structure defining the error.
  *  - "contents,size,changed", Evas_Coord[2]: reports contents size
  *    changed due new layout, script actions or any other events.
+ *  - "navigation,first", void: first navigation occurred.
+ *  - "resource,request,new", Ewk_Frame_Resource_Request*: reports that
+ *    there's a new resource request.
+ *  - "resource,request,willsend", Ewk_Frame_Resource_Request*: a resource will
+ *    be requested.
+ *  - "state,save", void: frame's state will be saved as a history item.
  */
 
@@ -80 +92 @@
     const char *failing_url; /**< the url that failed to load */
     Evas_Object *frame; /**< frame where the failure happened */
+};
+
+/**
+ * Structure used to report resource requests
+ *
+ * Details given before a resource is loaded on a given frame. It's used by
+ * ewk_frame_request_will_send() to inform the details of a to-be-loaded
+ * resource, allowing them to be overridden.
+ */
+typedef struct _Ewk_Frame_Resource_Request Ewk_Frame_Resource_Request;
+struct _Ewk_Frame_Resource_Request {
+    const char *url; /**< url of this resource */
+    const unsigned long identifier; /**< resource's identifier. Can not be changed */
 };
 

trunk/WebKit/efl/ewk/ewk_private.h

@@ -53 +53 @@
 void             ewk_view_uri_changed(Evas_Object *o);
 void             ewk_view_load_started(Evas_Object *o);
+void             ewk_view_load_provisional(Evas_Object *o);
 void             ewk_view_frame_main_load_started(Evas_Object *o);
+void             ewk_view_frame_main_cleared(Evas_Object *o);
+void             ewk_view_frame_main_icon_received(Evas_Object *o);
 void             ewk_view_load_finished(Evas_Object *o, const Ewk_Frame_Load_Error *error);
 void             ewk_view_load_error(Evas_Object *o, const Ewk_Frame_Load_Error *error);
 void             ewk_view_load_progress_changed(Evas_Object *o);
+void             ewk_view_load_show(Evas_Object* o);
+void             ewk_view_restore_state(Evas_Object *o, Evas_Object *frame);
 Evas_Object     *ewk_view_window_create(Evas_Object *o, Eina_Bool javascript, const WebCore::WindowFeatures* coreFeatures);
 
@@ -119 +124 @@
 
 void              ewk_frame_load_started(Evas_Object *o);
+void              ewk_frame_load_provisional(Evas_Object *o);
+void              ewk_frame_load_firstlayout_finished(Evas_Object *o);
+void              ewk_frame_load_firstlayout_nonempty_finished(Evas_Object *o);
+void              ewk_frame_load_document_finished(Evas_Object *o);
 void              ewk_frame_load_finished(Evas_Object *o, const char *error_domain, int error_code, Eina_Bool is_cancellation, const char *error_description, const char *failing_url);
 void              ewk_frame_load_error(Evas_Object *o, const char *error_domain, int error_code, Eina_Bool is_cancellation, const char *error_description, const char *failing_url);
 void              ewk_frame_load_progress_changed(Evas_Object *o);
+
+void              ewk_frame_request_will_send(Evas_Object *o, Ewk_Frame_Resource_Request *request);
+void              ewk_frame_request_assign_identifier(Evas_Object *o, const Ewk_Frame_Resource_Request *request);
+void              ewk_frame_view_state_save(Evas_Object *o, WebCore::HistoryItem* item);
+
+void              ewk_frame_did_perform_first_navigation(Evas_Object *o);
 
 void              ewk_frame_contents_size_changed(Evas_Object *o, Evas_Coord w, Evas_Coord h);