Changeset 55316 in webkit

Timestamp:

Feb 26, 2010 2:39:51 PM (14 years ago)

Author:

kov@webkit.org

Message:

WebKit/gtk

2009-12-04 Gustavo Noronha Silva <​gustavo.noronha@collabora.co.uk>

Reviewed by Xan Lopez.

[GTK] Needs proper reporting of frame loader callbacks, in DRT
​https://bugs.webkit.org/show_bug.cgi?id=32170

Add new signal to report when the document load is finished for a
frame.

• WebCoreSupport/FrameLoaderClientGtk.cpp: (WebKit::FrameLoaderClient::dispatchDidFinishDocumentLoad):
• webkit/webkitwebview.cpp: (webkit_web_view_class_init):

WebKitTools

2010-02-26 Gustavo Noronha Silva <​gustavo.noronha@collabora.co.uk>

Reviewed by Xan Lopez.

[GTK] Needs proper reporting of frame loader callbacks, in DRT
​https://bugs.webkit.org/show_bug.cgi?id=32170

Fix reporting of unload handlers, so that it is emitted where
needed, not after it.

• DumpRenderTree/gtk/DumpRenderTree.cpp: (webViewLoadFinished): (webViewDocumentLoadFinished): (createWebView):

LayoutTests

2010-02-26 Gustavo Noronha Silva <​gustavo.noronha@collabora.co.uk>

Reviewed by Xan Lopez.

[GTK] Needs proper reporting of frame loader callbacks, in DRT
​https://bugs.webkit.org/show_bug.cgi?id=32170

Unskip tests that now pass.

• LayoutTests/platform/gtk/http/tests/loading/redirect-with-no-location-crash-expected.txt: rebaselined.
• platform/gtk/Skipped:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/Skipped (modified) (2 diffs)
• LayoutTests/platform/gtk/http/tests/loading/redirect-with-no-location-crash-expected.txt (modified) (1 diff)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp (modified) (1 diff)
• WebKit/gtk/webkit/webkitwebview.cpp (modified) (2 diffs)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ -49 +49 @@
         * platform/mac/mathml/presentation/underover-expected.png: Added.
         * platform/mac/mathml/presentation/underover-expected.txt: Added.
+
+2010-02-26  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Needs proper reporting of frame loader callbacks, in DRT
+        https://bugs.webkit.org/show_bug.cgi?id=32170
+
+        Unskip tests that now pass.
+
+        * LayoutTests/platform/gtk/http/tests/loading/redirect-with-no-location-crash-expected.txt: rebaselined.
+        * platform/gtk/Skipped:
 
 2010-02-26  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>

trunk/LayoutTests/platform/gtk/Skipped

@@ -1400 +1400 @@
 fast/html/tab-order.html
 fast/html/text-field-input-types.html
-fast/loader/frames-with-unload-handlers-in-page-cache.html
 fast/loader/main-document-url-for-non-http-loads.html
-fast/loader/onunload-form-submit-crash-2.html
-fast/loader/onunload-form-submit-crash.html
 fast/loader/onload-policy-ignore-for-frame.html
 fast/loader/policy-delegate-action-hit-test-zoomed.html
@@ -5643 +5640 @@
 # Need proper frame loader callbacks reporting
 # See https://bugs.webkit.org/show_bug.cgi?id=32170
-fast/loader/stateobjects/document-destroyed-navigate-back-with-fragment-scroll.html
-fast/loader/stateobjects/document-destroyed-navigate-back.html
 http/tests/loading/state-object-security-exception.html
 http/tests/security/mixedContent/empty-url-plugin-in-frame.html

trunk/LayoutTests/platform/gtk/http/tests/loading/redirect-with-no-location-crash-expected.txt

@@ -1 @@
-
+main frame - didFinishDocumentLoadForFrameframe "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2009-12-04  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Needs proper reporting of frame loader callbacks, in DRT
+        https://bugs.webkit.org/show_bug.cgi?id=32170
+
+        Add new signal to report when the document load is finished for a
+        frame.
+
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::dispatchDidFinishDocumentLoad):
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_class_init):
+
 2010-02-26  Antonio Gomes  <tonikitoo@webkit.org>
 

trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

@@ -789 +789 @@
 void FrameLoaderClient::dispatchDidFinishDocumentLoad()
 {
-    notImplemented();
+    WebKitWebView* webView = getViewFromFrame(m_frame);
+    g_signal_emit_by_name(webView, "document-load-finished", m_frame);
 }
 

trunk/WebKit/gtk/webkit/webkitwebview.cpp

@@ -159 +159 @@
     DATABASE_QUOTA_EXCEEDED,
     RESOURCE_REQUEST_STARTING,
+    DOCUMENT_LOAD_FINISHED,
     LAST_SIGNAL
 };
@@ -2164 +2165 @@
             WEBKIT_TYPE_NETWORK_REQUEST,
             WEBKIT_TYPE_NETWORK_RESPONSE);
+
+    /*
+     * DOM-related signals. These signals are experimental, for now,
+     * and may change API and ABI. Their comments lack one * on
+     * purpose, to make them not be catched by gtk-doc.
+     */
+
+    /*
+     * WebKitWebView::document-load-finished
+     * @web_view: the object which received the signal
+     * @web_frame: the #WebKitWebFrame whose load dispatched this request
+     *
+     * Emitted when the DOM document object load is finished for the
+     * given frame.
+     */
+    webkit_web_view_signals[DOCUMENT_LOAD_FINISHED] = g_signal_new("document-load-finished",
+            G_TYPE_FROM_CLASS(webViewClass),
+            (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
+            0,
+            NULL, NULL,
+            g_cclosure_marshal_VOID__OBJECT,
+            G_TYPE_NONE, 1,
+            WEBKIT_TYPE_WEB_FRAME);
+
 
     /*

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-02-26  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Needs proper reporting of frame loader callbacks, in DRT
+        https://bugs.webkit.org/show_bug.cgi?id=32170
+
+        Fix reporting of unload handlers, so that it is emitted where
+        needed, not after it.
+
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        (webViewLoadFinished):
+        (webViewDocumentLoadFinished):
+        (createWebView):
+
 2010-02-26  Antonio Gomes  <tonikitoo@webkit.org>
 

trunk/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp

@@ -551 +551 @@
         if (frameName && (frameName[0] != '\0')) {
             char* tmp = g_strdup_printf("main frame \"%s\"", frameName);
-            g_free (frameName);
+            g_free(frameName);
             frameName = tmp;
         } else {
@@ -560 +560 @@
         g_free(frameName);
         frameName = g_strdup("frame (anonymous)");
+    } else {
+        char* tmp = g_strdup_printf("frame \"%s\"", frameName);
+        g_free(frameName);
+        frameName = tmp;
     }
 
@@ -567 +571 @@
 static void webViewLoadFinished(WebKitWebView* view, WebKitWebFrame* frame, void*)
 {
-    if (!done && !gLayoutTestController->dumpFrameLoadCallbacks()) {
+    if (frame != topLoadingFrame)
+        return;
+
+    topLoadingFrame = 0;
+    WorkQueue::shared()->setFrozen(true); // first complete load freezes the queue for the rest of this test
+    if (gLayoutTestController->waitToDump())
+        return;
+
+    if (WorkQueue::shared()->count())
+        g_timeout_add(0, processWork, 0);
+    else
+        dump();
+}
+
+static void webViewDocumentLoadFinished(WebKitWebView* view, WebKitWebFrame* frame, void*)
+{
+    if (!done && gLayoutTestController->dumpFrameLoadCallbacks()) {
+        char* frameName = getFrameNameSuitableForTestResult(view, frame);
+        printf("%s - didFinishDocumentLoadForFrame", frameName);
+        g_free(frameName);
+    } else if (!done) {
         guint pendingFrameUnloadEvents = webkit_web_frame_get_pending_unload_event_count(frame);
         if (pendingFrameUnloadEvents) {
@@ -575 +599 @@
         }
     }
-
-    if (frame != topLoadingFrame)
-        return;
-
-    topLoadingFrame = 0;
-    WorkQueue::shared()->setFrozen(true); // first complete load freezes the queue for the rest of this test
-    if (gLayoutTestController->waitToDump())
-        return;
-
-    if (WorkQueue::shared()->count())
-        g_timeout_add(0, processWork, 0);
-    else
-        dump();
 }
 
@@ -776 +787 @@
                      "signal::close-web-view", webViewClose, 0,
                      "signal::database-quota-exceeded", databaseQuotaExceeded, 0,
+                     "signal::document-load-finished", webViewDocumentLoadFinished, 0,
                      NULL);