git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5710aee)
WebKitTools/
authorzecke@webkit.org <zecke@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 5 Feb 2008 20:47:31 +0000 (20:47 +0000)
committerzecke@webkit.org <zecke@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 5 Feb 2008 20:47:31 +0000 (20:47 +0000)
2008-02-05  Holger Freyther  <zecke@selfish.org>

        Reviewed by Darin.

        In http://bugs.webkit.org/show_bug.cgi?id=16853 it was identified that the
        the output of the willCloseFrame and didClearWindowObject FrameLoadDelegate
        depends on the order the tests are executed.

        Propose to remove willCloseFrame and didlCearWindowObject output from the
        FrameLoadDelegate and update the test results. The output of didClearWindowObject
        is not interesting for any of the current tests and we have other ways to find
        out if a frame was closed or not.

        * DumpRenderTree/mac/FrameLoadDelegate.mm:
        * DumpRenderTree/win/FrameLoadDelegate.cpp:
        (FrameLoadDelegate::didClearWindowObject):
        * DumpRenderTree/win/FrameLoadDelegate.h:

LayoutTest:
2008-02-05  Holger Freyther  <zecke@selfish.org>

        Reviewed by Darin.

        In http://bugs.webkit.org/show_bug.cgi?id=16853 it was identified that the
        the output of the willCloseFrame and didClearWindowObject FrameLoadDelegate
        depends on the order the tests are executed.

        Propose to remove willCloseFrame and didlCearWindowObject output from the
        FrameLoadDelegate and update the test results. The output of didClearWindowObject
        is not interesting for any of the current tests and we have other ways to find
        out if a frame was closed or not.

        * http/tests/loading/bad-scheme-subframe-expected.txt:
        * http/tests/loading/bad-server-subframe-expected.txt:
        * http/tests/loading/basic-expected.txt:
        * http/tests/loading/empty-subframe-expected.txt:
        * http/tests/loading/gmail-assert-on-load-expected.txt:
        * http/tests/loading/onload-vs-immediate-refresh-expected.txt:
        * http/tests/loading/slow-parsing-subframe-expected.txt:
        * platform/mac/http/tests/loading/simple-subframe-expected.txt:
        * webarchive/loading/test-loading-archive-expected.txt:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@30014 268f45cc-cd09-0410-ab3c-d52691b4dbfc

14 files changed:
LayoutTests/ChangeLog patch | blob | history
LayoutTests/http/tests/loading/bad-scheme-subframe-expected.txt patch | blob | history
LayoutTests/http/tests/loading/bad-server-subframe-expected.txt patch | blob | history
LayoutTests/http/tests/loading/basic-expected.txt patch | blob | history
LayoutTests/http/tests/loading/empty-subframe-expected.txt patch | blob | history
LayoutTests/http/tests/loading/gmail-assert-on-load-expected.txt patch | blob | history
LayoutTests/http/tests/loading/onload-vs-immediate-refresh-expected.txt patch | blob | history
LayoutTests/http/tests/loading/slow-parsing-subframe-expected.txt patch | blob | history
LayoutTests/platform/mac/http/tests/loading/simple-subframe-expected.txt patch | blob | history
LayoutTests/webarchive/loading/test-loading-archive-expected.txt patch | blob | history
WebKitTools/ChangeLog patch | blob | history
WebKitTools/DumpRenderTree/mac/FrameLoadDelegate.mm patch | blob | history
WebKitTools/DumpRenderTree/win/FrameLoadDelegate.cpp patch | blob | history
WebKitTools/DumpRenderTree/win/FrameLoadDelegate.h patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9ff541754b3a74825f05a283d93870b2f5ddecf7..067323f016b598341d11890bbe0e030a64d36b5c 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,26 @@
+2008-02-05  Holger Freyther  <zecke@selfish.org>
+
+        Reviewed by Darin.
+
+        In http://bugs.webkit.org/show_bug.cgi?id=16853 it was identified that the
+        the output of the willCloseFrame and didClearWindowObject FrameLoadDelegate
+        depends on the order the tests are executed.
+        
+        Propose to remove willCloseFrame and didlCearWindowObject output from the
+        FrameLoadDelegate and update the test results. The output of didClearWindowObject
+        is not interesting for any of the current tests and we have other ways to find
+        out if a frame was closed or not.
+
+        * http/tests/loading/bad-scheme-subframe-expected.txt:
+        * http/tests/loading/bad-server-subframe-expected.txt:
+        * http/tests/loading/basic-expected.txt:
+        * http/tests/loading/empty-subframe-expected.txt:
+        * http/tests/loading/gmail-assert-on-load-expected.txt:
+        * http/tests/loading/onload-vs-immediate-refresh-expected.txt:
+        * http/tests/loading/slow-parsing-subframe-expected.txt:
+        * platform/mac/http/tests/loading/simple-subframe-expected.txt:
+        * webarchive/loading/test-loading-archive-expected.txt:
+
 2008-02-05  Alexey Proskuryakov  <ap@webkit.org>
 
         Reviewed by Darin.
diff --git a/LayoutTests/http/tests/loading/bad-scheme-subframe-expected.txt b/LayoutTests/http/tests/loading/bad-scheme-subframe-expected.txt
index fe9e12e5fbadacda6099182797b71170dfc41a9d..f1e63686589d3b6abc2b757c43f90d863dd224a6 100644 (file)
--- a/LayoutTests/http/tests/loading/bad-scheme-subframe-expected.txt
+++ b/LayoutTests/http/tests/loading/bad-scheme-subframe-expected.txt
@@ -1,7 +1,5 @@
 main frame - didStartProvisionalLoadForFrame
-main frame - willCloseFrame
 main frame - didCommitLoadForFrame
-main frame - didClearWindowObjectForFrame
 main frame - didFinishDocumentLoadForFrame
 main frame - didFinishLoadForFrame
 This is a test of load callbacks. It is only useful inside the regression test tool.
diff --git a/LayoutTests/http/tests/loading/bad-server-subframe-expected.txt b/LayoutTests/http/tests/loading/bad-server-subframe-expected.txt
index d9fd8e0c9ad882764471c22ce9e3081d42ea2732..0a78a7bf19e2a80bbcf00138b91a12d2162d3017 100644 (file)
--- a/LayoutTests/http/tests/loading/bad-server-subframe-expected.txt
+++ b/LayoutTests/http/tests/loading/bad-server-subframe-expected.txt
@@ -1,8 +1,5 @@
 main frame - didStartProvisionalLoadForFrame
-frame "f1" - willCloseFrame
-main frame - willCloseFrame
 main frame - didCommitLoadForFrame
-main frame - didClearWindowObjectForFrame
 frame "f1" - didStartProvisionalLoadForFrame
 main frame - didFinishDocumentLoadForFrame
 main frame - didHandleOnloadEventsForFrame
diff --git a/LayoutTests/http/tests/loading/basic-expected.txt b/LayoutTests/http/tests/loading/basic-expected.txt
index 557fca1da465e83d7007b3bac16ee9dd56dcc658..3bb3dd9a5acf677df0ca1f37d90c474efd62dd34 100644 (file)
--- a/LayoutTests/http/tests/loading/basic-expected.txt
+++ b/LayoutTests/http/tests/loading/basic-expected.txt
@@ -1,8 +1,5 @@
 main frame - didStartProvisionalLoadForFrame
-frame "f1" - willCloseFrame
-main frame - willCloseFrame
 main frame - didCommitLoadForFrame
-main frame - didClearWindowObjectForFrame
 main frame - didHandleOnloadEventsForFrame
 main frame - didFinishDocumentLoadForFrame
 main frame - didFinishLoadForFrame
diff --git a/LayoutTests/http/tests/loading/empty-subframe-expected.txt b/LayoutTests/http/tests/loading/empty-subframe-expected.txt
index 70166eba84e5a9b1661d91026ff9e3a8d02fb180..7ead448f67f8749cae0875d916fae43b3a71de56 100644 (file)
--- a/LayoutTests/http/tests/loading/empty-subframe-expected.txt
+++ b/LayoutTests/http/tests/loading/empty-subframe-expected.txt
@@ -1,9 +1,6 @@
 main frame - didStartProvisionalLoadForFrame
-main frame - willCloseFrame
 main frame - didCommitLoadForFrame
-main frame - didClearWindowObjectForFrame
 frame "f1" - didStartProvisionalLoadForFrame
-frame "f1" - willCloseFrame
 frame "f1" - didCommitLoadForFrame
 frame "f1" - didHandleOnloadEventsForFrame
 frame "f1" - didFinishDocumentLoadForFrame
diff --git a/LayoutTests/http/tests/loading/gmail-assert-on-load-expected.txt b/LayoutTests/http/tests/loading/gmail-assert-on-load-expected.txt
index 5365768d676304c289585b4e917d1c3f70afeea7..7f19412eef3fc201877e51490354fd6551ddad08 100644 (file)
--- a/LayoutTests/http/tests/loading/gmail-assert-on-load-expected.txt
+++ b/LayoutTests/http/tests/loading/gmail-assert-on-load-expected.txt
@@ -1,13 +1,8 @@
 main frame - didStartProvisionalLoadForFrame
-frame "f1" - willCloseFrame
-main frame - willCloseFrame
 main frame - didCommitLoadForFrame
-main frame - didClearWindowObjectForFrame
 frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
 main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - willCloseFrame
 frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didClearWindowObjectForFrame
 main frame - didHandleOnloadEventsForFrame
 main frame - didFinishLoadForFrame
 This test provokes HTMLTokenizer::timerFired to be called and from within timerFired we want to call WebCore::pageDestroyed.
diff --git a/LayoutTests/http/tests/loading/onload-vs-immediate-refresh-expected.txt b/LayoutTests/http/tests/loading/onload-vs-immediate-refresh-expected.txt
index d3cd814f1177784b66631b3fdff1a3e81e90b72f..17509db0447848ce72c0d4e5cb9faca76a32f13e 100644 (file)
--- a/LayoutTests/http/tests/loading/onload-vs-immediate-refresh-expected.txt
+++ b/LayoutTests/http/tests/loading/onload-vs-immediate-refresh-expected.txt
@@ -1,7 +1,5 @@
 main frame - didStartProvisionalLoadForFrame
-main frame - willCloseFrame
 main frame - didCommitLoadForFrame
-main frame - didClearWindowObjectForFrame
 main frame - didHandleOnloadEventsForFrame
 main frame - didFinishDocumentLoadForFrame
 main frame - didFinishLoadForFrame
diff --git a/LayoutTests/http/tests/loading/slow-parsing-subframe-expected.txt b/LayoutTests/http/tests/loading/slow-parsing-subframe-expected.txt
index c6bf81d35694075a44d23f3ab02d1a571db3ec1d..9e45e19e6c9a07ee5438a5b2439230e33760cea2 100644 (file)
--- a/LayoutTests/http/tests/loading/slow-parsing-subframe-expected.txt
+++ b/LayoutTests/http/tests/loading/slow-parsing-subframe-expected.txt
@@ -1,13 +1,8 @@
 main frame - didStartProvisionalLoadForFrame
-frame "f1" - willCloseFrame
-main frame - willCloseFrame
 main frame - didCommitLoadForFrame
-main frame - didClearWindowObjectForFrame
 frame "f1" - didStartProvisionalLoadForFrame
 main frame - didFinishDocumentLoadForFrame
-frame "f1" - willCloseFrame
 frame "f1" - didCommitLoadForFrame
-frame "f1" - didClearWindowObjectForFrame
 frame "f1" - didHandleOnloadEventsForFrame
 main frame - didHandleOnloadEventsForFrame
 frame "f1" - didFinishDocumentLoadForFrame
diff --git a/LayoutTests/platform/mac/http/tests/loading/simple-subframe-expected.txt b/LayoutTests/platform/mac/http/tests/loading/simple-subframe-expected.txt
index 1d08239469dc553859edcadf443a17eac9b78268..d4c499ae307d22332513fcc4e518f0261edbf7a9 100644 (file)
--- a/LayoutTests/platform/mac/http/tests/loading/simple-subframe-expected.txt
+++ b/LayoutTests/platform/mac/http/tests/loading/simple-subframe-expected.txt
@@ -1,10 +1,7 @@
 main frame - didStartProvisionalLoadForFrame
-main frame - willCloseFrame
 main frame - didCommitLoadForFrame
-main frame - didClearWindowObjectForFrame
 frame "f1" - didStartProvisionalLoadForFrame
 main frame - didFinishDocumentLoadForFrame
-frame "f1" - willCloseFrame
 frame "f1" - didCommitLoadForFrame
 frame "f1" - didHandleOnloadEventsForFrame
 main frame - didHandleOnloadEventsForFrame
diff --git a/LayoutTests/webarchive/loading/test-loading-archive-expected.txt b/LayoutTests/webarchive/loading/test-loading-archive-expected.txt
index cad172294d6b7d40810ee61d56b3ac418a636ea9..c1620ebd7575bce31369d7e7a23f74bb32a20c0f 100644 (file)
--- a/LayoutTests/webarchive/loading/test-loading-archive-expected.txt
+++ b/LayoutTests/webarchive/loading/test-loading-archive-expected.txt
@@ -1,13 +1,10 @@
 main frame - didStartProvisionalLoadForFrame
-main frame - willCloseFrame
 main frame - didCommitLoadForFrame
-main frame - didClearWindowObjectForFrame
 frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
 resources/helloworld.webarchive - willSendRequest <NSURLRequest resources/helloworld.webarchive> redirectResponse (null)
 main frame - didFinishDocumentLoadForFrame
 <unknown> - didFinishLoading
 resources/helloworld.webarchive - didReceiveResponse <NSURLResponse resources/helloworld.webarchive>
-frame "<!--framePath //<!--frame0-->-->" - willCloseFrame
 frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
 frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
 main frame - didHandleOnloadEventsForFrame
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 99fd754240b10508b7b772db5f756f57d0330eb2..7b04cf105024f3332b9a4e9736a984ef616b373c 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,21 @@
+2008-02-05  Holger Freyther  <zecke@selfish.org>
+
+        Reviewed by Darin.
+
+        In http://bugs.webkit.org/show_bug.cgi?id=16853 it was identified that the
+        the output of the willCloseFrame and didClearWindowObject FrameLoadDelegate
+        depends on the order the tests are executed.
+        
+        Propose to remove willCloseFrame and didlCearWindowObject output from the
+        FrameLoadDelegate and update the test results. The output of didClearWindowObject
+        is not interesting for any of the current tests and we have other ways to find
+        out if a frame was closed or not.
+
+        * DumpRenderTree/mac/FrameLoadDelegate.mm:
+        * DumpRenderTree/win/FrameLoadDelegate.cpp:
+        (FrameLoadDelegate::didClearWindowObject):
+        * DumpRenderTree/win/FrameLoadDelegate.h:
+
 2008-02-04  Mark Rowe  <mrowe@apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/WebKitTools/DumpRenderTree/mac/FrameLoadDelegate.mm b/WebKitTools/DumpRenderTree/mac/FrameLoadDelegate.mm
index 760c5e6389659803d16ee46c036ab026677c7938..98b6bacb6f1cac11fa9d90e825e4fa40eab45081 100644 (file)
--- a/WebKitTools/DumpRenderTree/mac/FrameLoadDelegate.mm
+++ b/WebKitTools/DumpRenderTree/mac/FrameLoadDelegate.mm
@@ -228,11 +228,6 @@
 
 - (void)webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)obj forFrame:(WebFrame *)frame
 {
-    if (!done && layoutTestController->dumpFrameLoadCallbacks()) {
-        NSString *string = [NSString stringWithFormat:@"%@ - didClearWindowObjectForFrame", [frame _drt_descriptionSuitableForTestResult]];
-        printf ("%s\n", [string UTF8String]);
-    }
-        
     ASSERT(obj == [frame windowObject]);
     ASSERT([obj JSObject] == JSContextGetGlobalObject([frame globalContext]));
 
@@ -319,14 +314,6 @@
     }
 }
 
-- (void)webView:(WebView *)sender willCloseFrame:(WebFrame *)frame;
-{
-    if (!done && layoutTestController->dumpFrameLoadCallbacks()) {
-        NSString *string = [NSString stringWithFormat:@"%@ - willCloseFrame", [frame _drt_descriptionSuitableForTestResult]];
-        printf ("%s\n", [string UTF8String]);
-    }
-}
-
 - (void)webView:(WebView *)sender didFinishDocumentLoadForFrame:(WebFrame *)frame;
 {
     if (!done && layoutTestController->dumpFrameLoadCallbacks()) {
diff --git a/WebKitTools/DumpRenderTree/win/FrameLoadDelegate.cpp b/WebKitTools/DumpRenderTree/win/FrameLoadDelegate.cpp
index 026951436916a51ed431bdac717811574e4bdedb..a99fe7c1e76a2b18ad5b034fba1844c39254d4f2 100644 (file)
--- a/WebKitTools/DumpRenderTree/win/FrameLoadDelegate.cpp
+++ b/WebKitTools/DumpRenderTree/win/FrameLoadDelegate.cpp
@@ -244,27 +244,12 @@ HRESULT STDMETHODCALLTYPE FrameLoadDelegate::didFailLoadWithError(
     return S_OK;
 }
 
-HRESULT STDMETHODCALLTYPE FrameLoadDelegate::willCloseFrame( 
-        /* [in] */ IWebView *webView,
-        /* [in] */ IWebFrame *frame)
-{
-    if (!done && layoutTestController->dumpFrameLoadCallbacks())
-        printf("%s - willCloseFrame\n",
-                descriptionSuitableForTestResult(frame).c_str());
-
-    return S_OK;
-}
-
 HRESULT STDMETHODCALLTYPE FrameLoadDelegate::didClearWindowObject( 
         /* [in] */ IWebView*webView,
         /* [in] */ JSContextRef context,
         /* [in] */ JSObjectRef windowObject,
         /* [in] */ IWebFrame* frame)
 {
-    if (!done && layoutTestController->dumpFrameLoadCallbacks())
-        printf("%s - didClearWindowObjectForFrame\n",
-                descriptionSuitableForTestResult(frame).c_str());
-
     JSValueRef exception = 0;
 
     ::layoutTestController->makeWindowObject(context, windowObject, &exception);
diff --git a/WebKitTools/DumpRenderTree/win/FrameLoadDelegate.h b/WebKitTools/DumpRenderTree/win/FrameLoadDelegate.h
index 8e694be27c936b98d1e5d74f07cd03838dfc3943..a8e89b22c84e9b59327d92233007a5479ce7a17c 100644 (file)
--- a/WebKitTools/DumpRenderTree/win/FrameLoadDelegate.h
+++ b/WebKitTools/DumpRenderTree/win/FrameLoadDelegate.h
@@ -99,10 +99,6 @@ public:
         /* [in] */ IWebView *webView,
         /* [in] */ IWebFrame *frame) { return E_NOTIMPL; } 
 
-    virtual HRESULT STDMETHODCALLTYPE willCloseFrame( 
-        /* [in] */ IWebView *webView,
-        /* [in] */ IWebFrame *frame);
-
     virtual HRESULT STDMETHODCALLTYPE windowScriptObjectAvailable( 
         /* [in] */ IWebView *sender,
         /* [in] */ JSContextRef context,
Mirror of the WebKit open source project from svn.webkit.org.