Changeset 30014 in webkit
- Timestamp:
- Feb 5, 2008 12:47:31 PM (16 years ago)
- Location:
- trunk
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r30013 r30014 1 2008-02-05 Holger Freyther <zecke@selfish.org> 2 3 Reviewed by Darin. 4 5 In http://bugs.webkit.org/show_bug.cgi?id=16853 it was identified that the 6 the output of the willCloseFrame and didClearWindowObject FrameLoadDelegate 7 depends on the order the tests are executed. 8 9 Propose to remove willCloseFrame and didlCearWindowObject output from the 10 FrameLoadDelegate and update the test results. The output of didClearWindowObject 11 is not interesting for any of the current tests and we have other ways to find 12 out if a frame was closed or not. 13 14 * http/tests/loading/bad-scheme-subframe-expected.txt: 15 * http/tests/loading/bad-server-subframe-expected.txt: 16 * http/tests/loading/basic-expected.txt: 17 * http/tests/loading/empty-subframe-expected.txt: 18 * http/tests/loading/gmail-assert-on-load-expected.txt: 19 * http/tests/loading/onload-vs-immediate-refresh-expected.txt: 20 * http/tests/loading/slow-parsing-subframe-expected.txt: 21 * platform/mac/http/tests/loading/simple-subframe-expected.txt: 22 * webarchive/loading/test-loading-archive-expected.txt: 23 1 24 2008-02-05 Alexey Proskuryakov <ap@webkit.org> 2 25 -
trunk/LayoutTests/http/tests/loading/bad-scheme-subframe-expected.txt
r25151 r30014 1 1 main frame - didStartProvisionalLoadForFrame 2 main frame - willCloseFrame3 2 main frame - didCommitLoadForFrame 4 main frame - didClearWindowObjectForFrame5 3 main frame - didFinishDocumentLoadForFrame 6 4 main frame - didFinishLoadForFrame -
trunk/LayoutTests/http/tests/loading/bad-server-subframe-expected.txt
r25151 r30014 1 1 main frame - didStartProvisionalLoadForFrame 2 frame "f1" - willCloseFrame3 main frame - willCloseFrame4 2 main frame - didCommitLoadForFrame 5 main frame - didClearWindowObjectForFrame6 3 frame "f1" - didStartProvisionalLoadForFrame 7 4 main frame - didFinishDocumentLoadForFrame -
trunk/LayoutTests/http/tests/loading/basic-expected.txt
r23723 r30014 1 1 main frame - didStartProvisionalLoadForFrame 2 frame "f1" - willCloseFrame3 main frame - willCloseFrame4 2 main frame - didCommitLoadForFrame 5 main frame - didClearWindowObjectForFrame6 3 main frame - didHandleOnloadEventsForFrame 7 4 main frame - didFinishDocumentLoadForFrame -
trunk/LayoutTests/http/tests/loading/empty-subframe-expected.txt
r25151 r30014 1 1 main frame - didStartProvisionalLoadForFrame 2 main frame - willCloseFrame3 2 main frame - didCommitLoadForFrame 4 main frame - didClearWindowObjectForFrame5 3 frame "f1" - didStartProvisionalLoadForFrame 6 frame "f1" - willCloseFrame7 4 frame "f1" - didCommitLoadForFrame 8 5 frame "f1" - didHandleOnloadEventsForFrame -
trunk/LayoutTests/http/tests/loading/gmail-assert-on-load-expected.txt
r29659 r30014 1 1 main frame - didStartProvisionalLoadForFrame 2 frame "f1" - willCloseFrame3 main frame - willCloseFrame4 2 main frame - didCommitLoadForFrame 5 main frame - didClearWindowObjectForFrame6 3 frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame 7 4 main frame - didFinishDocumentLoadForFrame 8 frame "<!--framePath //<!--frame0-->-->" - willCloseFrame9 5 frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame 10 frame "<!--framePath //<!--frame0-->-->" - didClearWindowObjectForFrame11 6 main frame - didHandleOnloadEventsForFrame 12 7 main frame - didFinishLoadForFrame -
trunk/LayoutTests/http/tests/loading/onload-vs-immediate-refresh-expected.txt
r29659 r30014 1 1 main frame - didStartProvisionalLoadForFrame 2 main frame - willCloseFrame3 2 main frame - didCommitLoadForFrame 4 main frame - didClearWindowObjectForFrame5 3 main frame - didHandleOnloadEventsForFrame 6 4 main frame - didFinishDocumentLoadForFrame -
trunk/LayoutTests/http/tests/loading/slow-parsing-subframe-expected.txt
r25151 r30014 1 1 main frame - didStartProvisionalLoadForFrame 2 frame "f1" - willCloseFrame3 main frame - willCloseFrame4 2 main frame - didCommitLoadForFrame 5 main frame - didClearWindowObjectForFrame6 3 frame "f1" - didStartProvisionalLoadForFrame 7 4 main frame - didFinishDocumentLoadForFrame 8 frame "f1" - willCloseFrame9 5 frame "f1" - didCommitLoadForFrame 10 frame "f1" - didClearWindowObjectForFrame11 6 frame "f1" - didHandleOnloadEventsForFrame 12 7 main frame - didHandleOnloadEventsForFrame -
trunk/LayoutTests/platform/mac/http/tests/loading/simple-subframe-expected.txt
r27986 r30014 1 1 main frame - didStartProvisionalLoadForFrame 2 main frame - willCloseFrame3 2 main frame - didCommitLoadForFrame 4 main frame - didClearWindowObjectForFrame5 3 frame "f1" - didStartProvisionalLoadForFrame 6 4 main frame - didFinishDocumentLoadForFrame 7 frame "f1" - willCloseFrame8 5 frame "f1" - didCommitLoadForFrame 9 6 frame "f1" - didHandleOnloadEventsForFrame -
trunk/LayoutTests/webarchive/loading/test-loading-archive-expected.txt
r25154 r30014 1 1 main frame - didStartProvisionalLoadForFrame 2 main frame - willCloseFrame3 2 main frame - didCommitLoadForFrame 4 main frame - didClearWindowObjectForFrame5 3 frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame 6 4 resources/helloworld.webarchive - willSendRequest <NSURLRequest resources/helloworld.webarchive> redirectResponse (null) … … 8 6 <unknown> - didFinishLoading 9 7 resources/helloworld.webarchive - didReceiveResponse <NSURLResponse resources/helloworld.webarchive> 10 frame "<!--framePath //<!--frame0-->-->" - willCloseFrame11 8 frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame 12 9 frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame -
trunk/WebKitTools/ChangeLog
r29999 r30014 1 2008-02-05 Holger Freyther <zecke@selfish.org> 2 3 Reviewed by Darin. 4 5 In http://bugs.webkit.org/show_bug.cgi?id=16853 it was identified that the 6 the output of the willCloseFrame and didClearWindowObject FrameLoadDelegate 7 depends on the order the tests are executed. 8 9 Propose to remove willCloseFrame and didlCearWindowObject output from the 10 FrameLoadDelegate and update the test results. The output of didClearWindowObject 11 is not interesting for any of the current tests and we have other ways to find 12 out if a frame was closed or not. 13 14 * DumpRenderTree/mac/FrameLoadDelegate.mm: 15 * DumpRenderTree/win/FrameLoadDelegate.cpp: 16 (FrameLoadDelegate::didClearWindowObject): 17 * DumpRenderTree/win/FrameLoadDelegate.h: 18 1 19 2008-02-04 Mark Rowe <mrowe@apple.com> 2 20 -
trunk/WebKitTools/DumpRenderTree/mac/FrameLoadDelegate.mm
r29663 r30014 229 229 - (void)webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)obj forFrame:(WebFrame *)frame 230 230 { 231 if (!done && layoutTestController->dumpFrameLoadCallbacks()) {232 NSString *string = [NSString stringWithFormat:@"%@ - didClearWindowObjectForFrame", [frame _drt_descriptionSuitableForTestResult]];233 printf ("%s\n", [string UTF8String]);234 }235 236 231 ASSERT(obj == [frame windowObject]); 237 232 ASSERT([obj JSObject] == JSContextGetGlobalObject([frame globalContext])); … … 320 315 } 321 316 322 - (void)webView:(WebView *)sender willCloseFrame:(WebFrame *)frame;323 {324 if (!done && layoutTestController->dumpFrameLoadCallbacks()) {325 NSString *string = [NSString stringWithFormat:@"%@ - willCloseFrame", [frame _drt_descriptionSuitableForTestResult]];326 printf ("%s\n", [string UTF8String]);327 }328 }329 330 317 - (void)webView:(WebView *)sender didFinishDocumentLoadForFrame:(WebFrame *)frame; 331 318 { -
trunk/WebKitTools/DumpRenderTree/win/FrameLoadDelegate.cpp
r29627 r30014 245 245 } 246 246 247 HRESULT STDMETHODCALLTYPE FrameLoadDelegate::willCloseFrame(248 /* [in] */ IWebView *webView,249 /* [in] */ IWebFrame *frame)250 {251 if (!done && layoutTestController->dumpFrameLoadCallbacks())252 printf("%s - willCloseFrame\n",253 descriptionSuitableForTestResult(frame).c_str());254 255 return S_OK;256 }257 258 247 HRESULT STDMETHODCALLTYPE FrameLoadDelegate::didClearWindowObject( 259 248 /* [in] */ IWebView*webView, … … 262 251 /* [in] */ IWebFrame* frame) 263 252 { 264 if (!done && layoutTestController->dumpFrameLoadCallbacks())265 printf("%s - didClearWindowObjectForFrame\n",266 descriptionSuitableForTestResult(frame).c_str());267 268 253 JSValueRef exception = 0; 269 254 -
trunk/WebKitTools/DumpRenderTree/win/FrameLoadDelegate.h
r28323 r30014 100 100 /* [in] */ IWebFrame *frame) { return E_NOTIMPL; } 101 101 102 virtual HRESULT STDMETHODCALLTYPE willCloseFrame(103 /* [in] */ IWebView *webView,104 /* [in] */ IWebFrame *frame);105 106 102 virtual HRESULT STDMETHODCALLTYPE windowScriptObjectAvailable( 107 103 /* [in] */ IWebView *sender,
Note: See TracChangeset
for help on using the changeset viewer.