Changeset 30014 in webkit


Ignore:
Timestamp:
Feb 5, 2008 12:47:31 PM (16 years ago)
Author:
zecke@webkit.org
Message:

WebKitTools/
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:
Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r30013 r30014  
     12008-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
    1242008-02-05  Alexey Proskuryakov  <ap@webkit.org>
    225
  • trunk/LayoutTests/http/tests/loading/bad-scheme-subframe-expected.txt

    r25151 r30014  
    11main frame - didStartProvisionalLoadForFrame
    2 main frame - willCloseFrame
    32main frame - didCommitLoadForFrame
    4 main frame - didClearWindowObjectForFrame
    53main frame - didFinishDocumentLoadForFrame
    64main frame - didFinishLoadForFrame
  • trunk/LayoutTests/http/tests/loading/bad-server-subframe-expected.txt

    r25151 r30014  
    11main frame - didStartProvisionalLoadForFrame
    2 frame "f1" - willCloseFrame
    3 main frame - willCloseFrame
    42main frame - didCommitLoadForFrame
    5 main frame - didClearWindowObjectForFrame
    63frame "f1" - didStartProvisionalLoadForFrame
    74main frame - didFinishDocumentLoadForFrame
  • trunk/LayoutTests/http/tests/loading/basic-expected.txt

    r23723 r30014  
    11main frame - didStartProvisionalLoadForFrame
    2 frame "f1" - willCloseFrame
    3 main frame - willCloseFrame
    42main frame - didCommitLoadForFrame
    5 main frame - didClearWindowObjectForFrame
    63main frame - didHandleOnloadEventsForFrame
    74main frame - didFinishDocumentLoadForFrame
  • trunk/LayoutTests/http/tests/loading/empty-subframe-expected.txt

    r25151 r30014  
    11main frame - didStartProvisionalLoadForFrame
    2 main frame - willCloseFrame
    32main frame - didCommitLoadForFrame
    4 main frame - didClearWindowObjectForFrame
    53frame "f1" - didStartProvisionalLoadForFrame
    6 frame "f1" - willCloseFrame
    74frame "f1" - didCommitLoadForFrame
    85frame "f1" - didHandleOnloadEventsForFrame
  • trunk/LayoutTests/http/tests/loading/gmail-assert-on-load-expected.txt

    r29659 r30014  
    11main frame - didStartProvisionalLoadForFrame
    2 frame "f1" - willCloseFrame
    3 main frame - willCloseFrame
    42main frame - didCommitLoadForFrame
    5 main frame - didClearWindowObjectForFrame
    63frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
    74main frame - didFinishDocumentLoadForFrame
    8 frame "<!--framePath //<!--frame0-->-->" - willCloseFrame
    95frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
    10 frame "<!--framePath //<!--frame0-->-->" - didClearWindowObjectForFrame
    116main frame - didHandleOnloadEventsForFrame
    127main frame - didFinishLoadForFrame
  • trunk/LayoutTests/http/tests/loading/onload-vs-immediate-refresh-expected.txt

    r29659 r30014  
    11main frame - didStartProvisionalLoadForFrame
    2 main frame - willCloseFrame
    32main frame - didCommitLoadForFrame
    4 main frame - didClearWindowObjectForFrame
    53main frame - didHandleOnloadEventsForFrame
    64main frame - didFinishDocumentLoadForFrame
  • trunk/LayoutTests/http/tests/loading/slow-parsing-subframe-expected.txt

    r25151 r30014  
    11main frame - didStartProvisionalLoadForFrame
    2 frame "f1" - willCloseFrame
    3 main frame - willCloseFrame
    42main frame - didCommitLoadForFrame
    5 main frame - didClearWindowObjectForFrame
    63frame "f1" - didStartProvisionalLoadForFrame
    74main frame - didFinishDocumentLoadForFrame
    8 frame "f1" - willCloseFrame
    95frame "f1" - didCommitLoadForFrame
    10 frame "f1" - didClearWindowObjectForFrame
    116frame "f1" - didHandleOnloadEventsForFrame
    127main frame - didHandleOnloadEventsForFrame
  • trunk/LayoutTests/platform/mac/http/tests/loading/simple-subframe-expected.txt

    r27986 r30014  
    11main frame - didStartProvisionalLoadForFrame
    2 main frame - willCloseFrame
    32main frame - didCommitLoadForFrame
    4 main frame - didClearWindowObjectForFrame
    53frame "f1" - didStartProvisionalLoadForFrame
    64main frame - didFinishDocumentLoadForFrame
    7 frame "f1" - willCloseFrame
    85frame "f1" - didCommitLoadForFrame
    96frame "f1" - didHandleOnloadEventsForFrame
  • trunk/LayoutTests/webarchive/loading/test-loading-archive-expected.txt

    r25154 r30014  
    11main frame - didStartProvisionalLoadForFrame
    2 main frame - willCloseFrame
    32main frame - didCommitLoadForFrame
    4 main frame - didClearWindowObjectForFrame
    53frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
    64resources/helloworld.webarchive - willSendRequest <NSURLRequest resources/helloworld.webarchive> redirectResponse (null)
     
    86<unknown> - didFinishLoading
    97resources/helloworld.webarchive - didReceiveResponse <NSURLResponse resources/helloworld.webarchive>
    10 frame "<!--framePath //<!--frame0-->-->" - willCloseFrame
    118frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
    129frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
  • trunk/WebKitTools/ChangeLog

    r29999 r30014  
     12008-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
    1192008-02-04  Mark Rowe  <mrowe@apple.com>
    220
  • trunk/WebKitTools/DumpRenderTree/mac/FrameLoadDelegate.mm

    r29663 r30014  
    229229- (void)webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)obj forFrame:(WebFrame *)frame
    230230{
    231     if (!done && layoutTestController->dumpFrameLoadCallbacks()) {
    232         NSString *string = [NSString stringWithFormat:@"%@ - didClearWindowObjectForFrame", [frame _drt_descriptionSuitableForTestResult]];
    233         printf ("%s\n", [string UTF8String]);
    234     }
    235        
    236231    ASSERT(obj == [frame windowObject]);
    237232    ASSERT([obj JSObject] == JSContextGetGlobalObject([frame globalContext]));
     
    320315}
    321316
    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 
    330317- (void)webView:(WebView *)sender didFinishDocumentLoadForFrame:(WebFrame *)frame;
    331318{
  • trunk/WebKitTools/DumpRenderTree/win/FrameLoadDelegate.cpp

    r29627 r30014  
    245245}
    246246
    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 
    258247HRESULT STDMETHODCALLTYPE FrameLoadDelegate::didClearWindowObject(
    259248        /* [in] */ IWebView*webView,
     
    262251        /* [in] */ IWebFrame* frame)
    263252{
    264     if (!done && layoutTestController->dumpFrameLoadCallbacks())
    265         printf("%s - didClearWindowObjectForFrame\n",
    266                 descriptionSuitableForTestResult(frame).c_str());
    267 
    268253    JSValueRef exception = 0;
    269254
  • trunk/WebKitTools/DumpRenderTree/win/FrameLoadDelegate.h

    r28323 r30014  
    100100        /* [in] */ IWebFrame *frame) { return E_NOTIMPL; }
    101101
    102     virtual HRESULT STDMETHODCALLTYPE willCloseFrame(
    103         /* [in] */ IWebView *webView,
    104         /* [in] */ IWebFrame *frame);
    105 
    106102    virtual HRESULT STDMETHODCALLTYPE windowScriptObjectAvailable(
    107103        /* [in] */ IWebView *sender,
Note: See TracChangeset for help on using the changeset viewer.