Changeset 70788 in webkit

Timestamp:

Oct 28, 2010 10:37:16 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-10-28 Sergio Villar Senin <​svillar@igalia.com>

Reviewed by Martin Robinson.

[GTK] WebKitWebFrame's load-status is not properly notified to the tests
​https://bugs.webkit.org/show_bug.cgi?id=48048

• platform/gtk/Skipped: unskipped a couple of tests

2010-10-28 Sergio Villar Senin <​svillar@igalia.com>

Reviewed by Martin Robinson.

[GTK] WebKitWebFrame's load-status is not properly notified to the tests
​https://bugs.webkit.org/show_bug.cgi?id=48048

"frame-created" signal must be issued before loading any data,
that way clients can correctly capture all the loading related
signals for that frame.

• WebCoreSupport/FrameLoaderClientGtk.cpp: (WebKit::FrameLoaderClient::createFrame):

2010-10-28 Sergio Villar Senin <​svillar@igalia.com>

Reviewed by Martin Robinson.

[GTK] WebKitWebFrame's load-status is not properly notified to the tests
​https://bugs.webkit.org/show_bug.cgi?id=48048

DRT now listens to WebKitWebFrame load-status signals for each
created frame instead of the load-status signal of the
WebKitWebView that only notifies about changes in the main frame.

• DumpRenderTree/gtk/DumpRenderTree.cpp: (webViewLoadFinished): (webFrameLoadStatusNotified): (frameCreatedCallback): (createWebView): (main):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/Skipped (modified) (1 diff)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp (modified) (2 diffs)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-28  Sergio Villar Senin  <svillar@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] WebKitWebFrame's load-status is not properly notified to the tests
+        https://bugs.webkit.org/show_bug.cgi?id=48048
+
+        * platform/gtk/Skipped: unskipped a couple of tests
+
 2010-10-28  Tony Chang  <tony@chromium.org>
 

trunk/LayoutTests/platform/gtk/Skipped

@@ -2790 +2790 @@
 # Needed to cover the fix for <rdar://problem/6727495>
 http/tests/loading/deleted-host-in-resource-load-delegate-callback.html
-http/tests/loading/empty-subframe.html
 http/tests/loading/gmail-assert-on-load.html
 http/tests/loading/preload-img-test.html
 http/tests/loading/redirect-with-no-location-crash.html
-http/tests/loading/slow-parsing-subframe.html
 http/tests/loading/text-content-type-with-binary-extension.html
 http/tests/local/blob/send-data-blob.html

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2010-10-28  Sergio Villar Senin  <svillar@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] WebKitWebFrame's load-status is not properly notified to the tests
+        https://bugs.webkit.org/show_bug.cgi?id=48048
+
+        "frame-created" signal must be issued before loading any data,
+        that way clients can correctly capture all the loading related
+        signals for that frame.
+
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::createFrame):
+
 2010-10-27  Mario Sanchez Prada  <msanchez@igalia.com>
 

trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

@@ -593 +593 @@
         return 0;
 
+    g_signal_emit_by_name(webView, "frame-created", kitFrame);
+
     childFrame->loader()->loadURLIntoChildFrame(url, referrer, childFrame.get());
 
@@ -599 +601 @@
         return 0;
 
-    g_signal_emit_by_name(webView, "frame-created", kitFrame);
     return childFrame.release();
 }

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-10-28  Sergio Villar Senin  <svillar@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] WebKitWebFrame's load-status is not properly notified to the tests
+        https://bugs.webkit.org/show_bug.cgi?id=48048
+
+        DRT now listens to WebKitWebFrame load-status signals for each
+        created frame instead of the load-status signal of the
+        WebKitWebView that only notifies about changes in the main frame.
+
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        (webViewLoadFinished):
+        (webFrameLoadStatusNotified):
+        (frameCreatedCallback):
+        (createWebView):
+        (main):
+
 2010-10-28  Tony Chang  <tony@chromium.org>
 

trunk/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp

@@ -728 +728 @@
 }
 
-static void webViewLoadCommitted(WebKitWebView* view, WebKitWebFrame* frame, void*)
-{
-    if (!done && gLayoutTestController->dumpFrameLoadCallbacks()) {
-        char* frameName = getFrameNameSuitableForTestResult(view, frame);
-        printf("%s - didCommitLoadForFrame\n", frameName);
-        g_free(frameName);
-    }
-}
-
-
 static void webViewLoadFinished(WebKitWebView* view, WebKitWebFrame* frame, void*)
 {
-    if (!done && gLayoutTestController->dumpFrameLoadCallbacks()) {
-        char* frameName = getFrameNameSuitableForTestResult(view, frame);
-        printf("%s - didFinishLoadForFrame\n", frameName);
-        g_free(frameName);
-    }
-
     if (frame != topLoadingFrame)
         return;
@@ -981 +965 @@
 }
 
-static void webViewLoadStatusNotified(WebKitWebView* view, gpointer user_data)
-{
-    WebKitLoadStatus loadStatus = webkit_web_view_get_load_status(view);
+static void webFrameLoadStatusNotified(WebKitWebFrame* frame, gpointer user_data)
+{
+    WebKitLoadStatus loadStatus = webkit_web_frame_get_load_status(frame);
 
     if (gLayoutTestController->dumpFrameLoadCallbacks()) {
-        if (loadStatus == WEBKIT_LOAD_PROVISIONAL) {
-            char* frameName = getFrameNameSuitableForTestResult(view, mainFrame);
-            printf("%s - didStartProvisionalLoadForFrame\n", frameName);
-            g_free(frameName);
+        GOwnPtr<char> frameName(getFrameNameSuitableForTestResult(webkit_web_frame_get_web_view(frame), frame));
+
+        switch (loadStatus) {
+        case WEBKIT_LOAD_PROVISIONAL:
+            if (!done)
+                printf("%s - didStartProvisionalLoadForFrame\n", frameName.get());
+            break;
+        case WEBKIT_LOAD_COMMITTED:
+            if (!done)
+                printf("%s - didCommitLoadForFrame\n", frameName.get());
+            break;
+        case WEBKIT_LOAD_FINISHED:
+            if (frame != topLoadingFrame || !done)
+                printf("%s - didFinishLoadForFrame\n", frameName.get());
+            break;
+        default:
+            break;
         }
     }
+}
+
+static void frameCreatedCallback(WebKitWebView* webView, WebKitWebFrame* webFrame, gpointer user_data)
+{
+    g_signal_connect(webFrame, "notify::load-status", G_CALLBACK(webFrameLoadStatusNotified), NULL);
 }
 
@@ -1007 +1009 @@
                      "signal::load-started", webViewLoadStarted, 0,
                      "signal::load-finished", webViewLoadFinished, 0,
-                     "signal::load-committed", webViewLoadCommitted, 0,
                      "signal::window-object-cleared", webViewWindowObjectCleared, 0,
                      "signal::console-message", webViewConsoleMessage, 0,
@@ -1025 +1026 @@
                      "signal::drag-end", dragEndCallback, 0,
                      "signal::drag-failed", dragFailedCallback, 0,
-
-                     NULL);
-
-    g_signal_connect(view,
-                     "notify::load-status", G_CALLBACK(webViewLoadStatusNotified),
+                     "signal::frame-created", frameCreatedCallback, 0,
+
                      NULL);
 
@@ -1043 +1041 @@
         webkit_web_view_set_settings(view, settings);
     }
+
+    // frame-created is not issued for main frame. That's why we must do this here
+    WebKitWebFrame* frame = webkit_web_view_get_main_frame(view);
+    g_signal_connect(frame, "notify::load-status", G_CALLBACK(webFrameLoadStatusNotified), NULL);
 
     return view;