Changeset 64928 in webkit

Timestamp:

Aug 7, 2010 6:59:00 PM (14 years ago)

Author:

weinig@apple.com

Message:

WebKitTestRunner needs to print onunload handler information
<rdar://problem/8213831>
​https://bugs.webkit.org/show_bug.cgi?id=42703

Reviewed by Anders Carlsson.

WebKit2:

Add SPI to get the number of pending unload events.

• WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:

(WKBundleFrameGetPendingUnloadCount):

• WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h:
• WebProcess/WebPage/WebFrame.cpp:

(WebKit::WebFrame::pendingUnloadCount):

• WebProcess/WebPage/WebFrame.h:

WebKitTools:

• WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:

(WTR::operator<<):
(WTR::InjectedBundlePage::didFinishDocumentLoadForFrame):

LayoutTests:

• platform/mac-wk2/Skipped:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-wk2/Skipped (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp (modified) (1 diff)
• WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h (modified) (1 diff)
• WebKit2/WebProcess/WebPage/WebFrame.cpp (modified) (1 diff)
• WebKit2/WebProcess/WebPage/WebFrame.h (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-08-07  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Anders Carlsson.
+
+        WebKitTestRunner needs to print onunload handler information
+        <rdar://problem/8213831>
+        https://bugs.webkit.org/show_bug.cgi?id=42703
+
+        * platform/mac-wk2/Skipped:
+
 2010-08-07  Sam Weinig  <sam@webkit.org>
 

trunk/LayoutTests/platform/mac-wk2/Skipped

@@ -1794 +1794 @@
 http/tests/plugins/third-party-cookie-accept-policy.html
 
-# WebKitTestRunner needs to print onunload handler information
-# <https://bugs.webkit.org/show_bug.cgi?id=42703>
-fast/events/onunload-clears-onbeforeunload.html
-fast/events/onunload-not-on-body.html
-fast/events/onunload.html
-fast/events/pageshow-pagehide-on-back-uncached.html
-fast/events/pageshow-pagehide.html
-fast/events/stop-load-in-unload-handler-using-document-write.html
-fast/events/stop-load-in-unload-handler-using-window-stop.html
-fast/forms/button-state-restore.html
-fast/frames/frame-unload-crash.html
-fast/loader/onunload-form-submit-crash-2.html
-fast/loader/onunload-form-submit-crash.html
-fast/loader/start-load-in-unload.html
-fast/loader/stateobjects/pushstate-in-iframe.html
-fast/loader/stateobjects/replacestate-in-iframe.html
-fast/loader/unload-form-about-blank.html
-fast/loader/unload-form-post-about-blank.html
-fast/loader/unload-form-post.html
-fast/loader/unload-form.html
-fast/loader/unload-hyperlink-targeted.html
-fast/loader/unload-hyperlink.html
-fast/loader/unload-javascript-url.html
-fast/loader/unload-reload.html
-fast/loader/unload-window-location.html
-http/tests/navigation/history-back-across-form-submission-to-fragment.html
-http/tests/security/window-events-pass.html
-http/tests/xmlhttprequest/frame-load-cancelled-abort.html
-http/tests/xmlhttprequest/frame-unload-abort-crash.html
-http/tests/xmlhttprequest/send-undefined-and-null.html
-http/tests/xmlhttprequest/xhr-onunload.html
-
 # WebKitTestRunner needs to print history delegate information
 # <https://bugs.webkit.org/show_bug.cgi?id=42704>
@@ -1985 +1953 @@
 # match Firefox or Chrome. We should either fix the test, or get rid of it.
 plugins/get-url-with-blank-target.html
+
+# Unexplained failures that were formerly in the WebKitTestRunner needs to print onunload handler list.
+fast/events/onunload-clears-onbeforeunload.html
 
 # Unexplained failures that were formerly in the dumpChildFramesAsText list.

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-08-07  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Anders Carlsson.
+
+        WebKitTestRunner needs to print onunload handler information
+        <rdar://problem/8213831>
+        https://bugs.webkit.org/show_bug.cgi?id=42703
+
+        Add SPI to get the number of pending unload events.
+
+        * WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
+        (WKBundleFrameGetPendingUnloadCount):
+        * WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h:
+        * WebProcess/WebPage/WebFrame.cpp:
+        (WebKit::WebFrame::pendingUnloadCount):
+        * WebProcess/WebPage/WebFrame.h:
+
 2010-08-07  Sam Weinig  <sam@webkit.org>
 

trunk/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp

@@ -104 +104 @@
     return toCopiedRef(toWK(frameRef)->innerText());
 }
+
+unsigned WKBundleFrameGetPendingUnloadCount(WKBundleFrameRef frameRef)
+{
+    return toWK(frameRef)->pendingUnloadCount();
+}

trunk/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h

@@ -45 +45 @@
 WK_EXPORT unsigned WKBundleFrameGetNumberOfActiveAnimations(WKBundleFrameRef frame);
 WK_EXPORT bool WKBundleFramePauseAnimationOnElementWithId(WKBundleFrameRef frame, WKStringRef name, WKStringRef elementID, double time);
+WK_EXPORT unsigned WKBundleFrameGetPendingUnloadCount(WKBundleFrameRef frame);
 
 #ifdef __cplusplus

trunk/WebKit2/WebProcess/WebPage/WebFrame.cpp

@@ -250 +250 @@
 }
 
+unsigned WebFrame::pendingUnloadCount()
+{
+    if (!m_coreFrame)
+        return 0;
+
+    return m_coreFrame->domWindow()->pendingUnloadEventListeners();
+}
+
 JSGlobalContextRef WebFrame::jsContext()
 {

trunk/WebKit2/WebProcess/WebPage/WebFrame.h

@@ -87 +87 @@
     bool pauseAnimationOnElementWithId(const WebCore::String& animationName, const WebCore::String& elementID, double time);
 
+    unsigned pendingUnloadCount();
+
     // Simple listener class used by plug-ins to know when frames finish or fail loading.
     class LoadListener {

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-08-07  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Anders Carlsson.
+
+        WebKitTestRunner needs to print onunload handler information
+        <rdar://problem/8213831>
+        https://bugs.webkit.org/show_bug.cgi?id=42703
+
+        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+        (WTR::operator<<):
+        (WTR::InjectedBundlePage::didFinishDocumentLoadForFrame):
+
 2010-08-07  Sam Weinig  <sam@webkit.org>
 

trunk/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

@@ -41 +41 @@
 namespace WTR {
 
+static ostream& operator<<(ostream& out, WKBundleFrameRef frame)
+{
+    WKRetainPtr<WKStringRef> name(AdoptWK, WKBundleFrameCopyName(frame));
+    if (WKBundleFrameIsMainFrame(frame)) {
+        if (!WKStringIsEmpty(name.get()))
+            out << "main frame \"" << name << "\"";
+        else
+            out << "main frame";
+    } else {
+        if (!WKStringIsEmpty(name.get()))
+            out << "frame \"" << name << "\"";
+        else
+            out << "frame (anonymous)";
+    }
+
+    return out;
+}
+
 static string dumpPath(WKBundleNodeRef node)
 {
@@ -389 +407 @@
 void InjectedBundlePage::didFinishDocumentLoadForFrame(WKBundleFrameRef frame)
 {
+    
+    unsigned pendingFrameUnloadEvents = WKBundleFrameGetPendingUnloadCount(frame);
+    if (pendingFrameUnloadEvents)
+        InjectedBundle::shared().os() << frame << " - has " << pendingFrameUnloadEvents << " onunload handler(s)\n";
 }