Changeset 145359 in webkit

Timestamp:

Mar 11, 2013, 6:15:17 AM (14 years ago)

Author:

Carlos Garcia Campos

Message:

WebKitWebPage::document-loaded signal emitted multiple times

Patch by Manuel Rego Casasnovas <Manuel Rego Casasnovas> on 2013-03-11
Reviewed by Carlos Garcia Campos.

This happens in websites with multiple frames, because the signal
is emitted for every frame.

• WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:

(didFinishDocumentLoadForFrame): Add an early return to make sure
the WebKitWebPage::document-loaded signal is only emitted for the
main frame.

Location:

releases/WebKitGTK/webkit-2.0/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-03-11  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        WebKitWebPage::document-loaded signal emitted multiple times
+
+        Reviewed by Carlos Garcia Campos.
+
+        This happens in websites with multiple frames, because the signal
+        is emitted for every frame.
+
+        * WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:
+        (didFinishDocumentLoadForFrame): Add an early return to make sure
+        the WebKitWebPage::document-loaded signal is only emitted for the
+        main frame.
+
 2013-03-10  Claudio Saavedra  <csaavedra@igalia.com>
 

releases/WebKitGTK/webkit-2.0/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp

@@ -107 +107 @@
 }
 
-static void didFinishDocumentLoadForFrame(WKBundlePageRef, WKBundleFrameRef, WKTypeRef*, const void *clientInfo)
-{
+static void didFinishDocumentLoadForFrame(WKBundlePageRef, WKBundleFrameRef frame, WKTypeRef*, const void *clientInfo)
+{
+    if (!WKBundleFrameIsMainFrame(frame))
+        return;
+
     g_signal_emit(WEBKIT_WEB_PAGE(clientInfo), signals[DOCUMENT_LOADED], 0);
 }