Changeset 144262 in webkit


Ignore:
Timestamp:
Feb 27, 2013 10:41:00 PM (11 years ago)
Author:
abarth@webkit.org
Message:

[Chromium] Enable threaded HTML parser by default in DumpRenderTree
https://bugs.webkit.org/show_bug.cgi?id=110907

Reviewed by Eric Seidel.

Tools:

This patch changes --enable-threaded-html-parser into
--disable-threaded-html-parser and thereby enables the threaded HTML
parser by default for the Chromium port.

  • DumpRenderTree/chromium/DumpRenderTree.cpp:
  • DumpRenderTree/chromium/TestRunner/src/WebPreferences.cpp:

(WebTestRunner::WebPreferences::reset):

  • DumpRenderTree/chromium/TestShell.cpp:

(TestShell::TestShell):

LayoutTests:

Update test results to show subtle differences in FrameLoaderClient callbacks.

  • platform/chromium-mac/security/block-test-no-port-expected.txt: Removed.
  • platform/chromium-win/fast/images/support-broken-image-delegate-expected.txt:
  • platform/chromium-win/security/block-test-no-port-expected.txt: Removed.
  • platform/chromium/fast/images/support-broken-image-delegate-expected.txt:
  • platform/chromium/fast/loader/main-document-url-for-non-http-loads-expected.txt: Added.
  • platform/chromium/http/tests/loading/307-after-303-after-post-expected.txt: Added.
  • platform/chromium/http/tests/misc/favicon-loads-with-images-disabled-expected.txt: Added.
  • platform/chromium/http/tests/misc/will-send-request-returns-null-on-redirect-expected.txt:
  • platform/chromium/http/tests/misc/window-dot-stop-expected.txt: Added.
  • platform/chromium/http/tests/security/XFrameOptions/x-frame-options-deny-expected.txt: Added.
  • platform/chromium/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-expected.txt: Added.
  • platform/chromium/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-in-body-expected.txt: Added.
  • platform/chromium/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-allow-expected.txt: Added.
  • platform/chromium/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-deny-expected.txt: Added.
  • platform/chromium/http/tests/security/XFrameOptions/x-frame-options-invalid-expected.txt: Added.
  • platform/chromium/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow-expected.txt: Added.
  • platform/chromium/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-deny-expected.txt: Added.
  • platform/chromium/inspector/debugger/pause-in-inline-script-expected.txt: Added.
  • platform/chromium/inspector/timeline/timeline-script-tag-1-expected.txt: Added.
  • platform/chromium/security/block-test-no-port-expected.txt:
Location:
trunk
Files:
15 added
2 deleted
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r144260 r144262  
     12013-02-27  Adam Barth  <abarth@webkit.org>
     2
     3        [Chromium] Enable threaded HTML parser by default in DumpRenderTree
     4        https://bugs.webkit.org/show_bug.cgi?id=110907
     5
     6        Reviewed by Eric Seidel.
     7
     8        Update test results to show subtle differences in FrameLoaderClient callbacks.
     9
     10        * platform/chromium-mac/security/block-test-no-port-expected.txt: Removed.
     11        * platform/chromium-win/fast/images/support-broken-image-delegate-expected.txt:
     12        * platform/chromium-win/security/block-test-no-port-expected.txt: Removed.
     13        * platform/chromium/fast/images/support-broken-image-delegate-expected.txt:
     14        * platform/chromium/fast/loader/main-document-url-for-non-http-loads-expected.txt: Added.
     15        * platform/chromium/http/tests/loading/307-after-303-after-post-expected.txt: Added.
     16        * platform/chromium/http/tests/misc/favicon-loads-with-images-disabled-expected.txt: Added.
     17        * platform/chromium/http/tests/misc/will-send-request-returns-null-on-redirect-expected.txt:
     18        * platform/chromium/http/tests/misc/window-dot-stop-expected.txt: Added.
     19        * platform/chromium/http/tests/security/XFrameOptions/x-frame-options-deny-expected.txt: Added.
     20        * platform/chromium/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-expected.txt: Added.
     21        * platform/chromium/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-in-body-expected.txt: Added.
     22        * platform/chromium/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-allow-expected.txt: Added.
     23        * platform/chromium/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-deny-expected.txt: Added.
     24        * platform/chromium/http/tests/security/XFrameOptions/x-frame-options-invalid-expected.txt: Added.
     25        * platform/chromium/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow-expected.txt: Added.
     26        * platform/chromium/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-deny-expected.txt: Added.
     27        * platform/chromium/inspector/debugger/pause-in-inline-script-expected.txt: Added.
     28        * platform/chromium/inspector/timeline/timeline-script-tag-1-expected.txt: Added.
     29        * platform/chromium/security/block-test-no-port-expected.txt:
     30
    1312013-02-27  Tien-Ren Chen  <trchen@chromium.org>
    232
  • trunk/LayoutTests/platform/chromium-win/fast/images/support-broken-image-delegate-expected.txt

    r144150 r144262  
    11CONSOLE MESSAGE: line 8: Uncaught TypeError: Object [object Object] has no method 'setShouldPaintBrokenImage'
    22resources/broken-image-with-invalid-format.png - willSendRequest <NSURLRequest URL resources/broken-image-with-invalid-format.png, main document URL support-broken-image-delegate.html, http method GET> redirectResponse (null)
    3 <unknown> - didFinishLoading
    43resources/broken-image-with-invalid-format.png - didReceiveResponse <NSURLResponse resources/broken-image-with-invalid-format.png, http status code 0>
    54resources/broken-image-with-invalid-format.png - didFinishLoading
  • trunk/LayoutTests/platform/chromium-win/http/tests/loading/redirect-methods-expected.txt

    r144150 r144262  
    44main frame - didHandleOnloadEventsForFrame
    55main frame - didFinishLoadForFrame
    6 <unknown> - didFinishLoading
    76frame "0" - didStartProvisionalLoadForFrame
    87frame "0" - didCommitLoadForFrame
     
    1615frame "0" - didCancelClientRedirectForFrame
    1716frame "0" - didCommitLoadForFrame
     17http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
    1818frame "0" - didFinishDocumentLoadForFrame
    1919frame "0" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/redirect-methods-result.php
    2020frame "0" - didHandleOnloadEventsForFrame
    2121frame "0" - didFinishLoadForFrame
    22 http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
    2322frame "0" - didStartProvisionalLoadForFrame
    2423http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.php, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method POST> redirectResponse (null)
     
    2827frame "0" - didCancelClientRedirectForFrame
    2928frame "0" - didCommitLoadForFrame
     29http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - didFinishLoading
    3030frame "0" - didFinishDocumentLoadForFrame
    3131frame "1" - didStartProvisionalLoadForFrame
     
    3737frame "0" - didHandleOnloadEventsForFrame
    3838frame "0" - didFinishLoadForFrame
    39 http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - didFinishLoading
    4039frame "1" - didStartProvisionalLoadForFrame
    4140http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-form.html, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method GET> redirectResponse (null)
     
    4342frame "1" - didCancelClientRedirectForFrame
    4443frame "1" - didCommitLoadForFrame
     44http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
    4545frame "1" - didFinishDocumentLoadForFrame
    4646frame "1" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/redirect-methods-result.php
    4747frame "1" - didHandleOnloadEventsForFrame
    4848frame "1" - didFinishLoadForFrame
    49 http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
    5049frame "1" - didStartProvisionalLoadForFrame
    5150http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.php, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method POST> redirectResponse (null)
     
    5554frame "1" - didCancelClientRedirectForFrame
    5655frame "1" - didCommitLoadForFrame
     56http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - didFinishLoading
    5757frame "1" - didFinishDocumentLoadForFrame
    5858frame "2" - didStartProvisionalLoadForFrame
     
    6464frame "1" - didHandleOnloadEventsForFrame
    6565frame "1" - didFinishLoadForFrame
    66 http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - didFinishLoading
    6766frame "2" - didStartProvisionalLoadForFrame
    6867http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-form.html, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method GET> redirectResponse (null)
     
    7069frame "2" - didCancelClientRedirectForFrame
    7170frame "2" - didCommitLoadForFrame
     71http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
    7272frame "2" - didFinishDocumentLoadForFrame
    7373frame "2" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/redirect-methods-result.php
    7474frame "2" - didHandleOnloadEventsForFrame
    7575frame "2" - didFinishLoadForFrame
    76 http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
    7776frame "2" - didStartProvisionalLoadForFrame
    7877http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.php, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method POST> redirectResponse (null)
     
    8281frame "2" - didCancelClientRedirectForFrame
    8382frame "2" - didCommitLoadForFrame
     83http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - didFinishLoading
    8484frame "2" - didFinishDocumentLoadForFrame
    8585frame "3" - didStartProvisionalLoadForFrame
     
    9191frame "2" - didHandleOnloadEventsForFrame
    9292frame "2" - didFinishLoadForFrame
    93 http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - didFinishLoading
    9493frame "3" - didStartProvisionalLoadForFrame
    9594http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-form.html, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method GET> redirectResponse (null)
     
    9796frame "3" - didCancelClientRedirectForFrame
    9897frame "3" - didCommitLoadForFrame
     98http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
    9999frame "3" - didFinishDocumentLoadForFrame
    100100frame "3" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/redirect-methods-result.php
    101101frame "3" - didHandleOnloadEventsForFrame
    102102frame "3" - didFinishLoadForFrame
    103 http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
    104103frame "3" - didStartProvisionalLoadForFrame
    105104http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.php, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method POST> redirectResponse (null)
     
    109108frame "3" - didCancelClientRedirectForFrame
    110109frame "3" - didCommitLoadForFrame
     110http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - didFinishLoading
    111111frame "3" - didFinishDocumentLoadForFrame
    112112frame "3" - didHandleOnloadEventsForFrame
  • trunk/LayoutTests/platform/chromium/TestExpectations

    r144245 r144262  
    30213021webkit.org/b/72039 [ Android Linux Release ] fast/forms/form-attribute-elements-order.html [ Missing Pass ]
    30223022webkit.org/b/72039 [ Android Linux Release ] fast/forms/form-attribute-elements-order2.html [ Missing Pass ]
    3023 webkit.org/b/72039 [ Debug ] http/tests/multipart/policy-ignore-crash.php [ Missing Pass ]
    30243023webkit.org/b/72039 [ Release ] fast/forms/formaction-attribute.html [ Missing Pass ]
    30253024webkit.org/b/78620 [ Android Linux Debug ] fast/forms/formaction-attribute.html [ Failure Pass Slow ]
     3025
     3026webkit.org/b/110929 http/tests/multipart/policy-ignore-crash.php [ Missing Failure ]
     3027webkit.org/b/110929 http/tests/multipart/multipart-html.php [ Missing Failure ]
     3028webkit.org/b/111023 fast/loader/unload-hyperlink-targeted.html [ Timeout ]
    30263029
    30273030webkit.org/b/70988 [ Mac Win Debug ] fast/forms/submit-to-blank-multiple-times.html [ Failure Pass ]
  • trunk/LayoutTests/platform/chromium/fast/images/support-broken-image-delegate-expected.txt

    r144150 r144262  
    11resources/broken-image-with-invalid-format.png - willSendRequest <NSURLRequest URL resources/broken-image-with-invalid-format.png, main document URL support-broken-image-delegate.html, http method GET> redirectResponse (null)
    2 <unknown> - didFinishLoading
    32resources/broken-image-with-invalid-format.png - didReceiveResponse <NSURLResponse resources/broken-image-with-invalid-format.png, http status code 0>
    43resources/broken-image-with-invalid-format.png - shouldPaintBrokenImage: NO
  • trunk/LayoutTests/platform/chromium/http/tests/misc/will-send-request-returns-null-on-redirect-expected.txt

    r144150 r144262  
    11http://127.0.0.1:8000/misc/resources/redirect-to-http-url.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/misc/resources/redirect-to-http-url.php, main document URL http://127.0.0.1:8000/misc/will-send-request-returns-null-on-redirect.html, http method GET> redirectResponse (null)
    2 <unknown> - didFinishLoading
    32http://127.0.0.1:8000/misc/resources/redirect-to-http-url.php - willSendRequest <NSURLRequest URL http://www.example.com/, main document URL http://127.0.0.1:8000/misc/will-send-request-returns-null-on-redirect.html, http method GET> redirectResponse <NSURLResponse http://127.0.0.1:8000/misc/resources/redirect-to-http-url.php, http status code 302>
    43Returning null for this redirect
  • trunk/LayoutTests/platform/chromium/security/block-test-no-port-expected.txt

    r144150 r144262  
    11http://255.255.255.255/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255/test.jpg, main document URL block-test-no-port.html, http method GET> redirectResponse (null)
    2 <unknown> - didFinishLoading
    3 http://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -138, failing URL "http://255.255.255.255/test.jpg">
     2http://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1004, failing URL "http://255.255.255.255/test.jpg">
    43This test attempts to change the src of an IMG tag to a blocked IP with no port to confirm that WebKit returns the correct error for it - blocked instead of cannot find. Due to the nature of this test, the results can only be processed automatically via DumpRenderTree. In addition, on some systems the results may depend on the behavior of the proxy.
    54
  • trunk/Tools/ChangeLog

    r144259 r144262  
     12013-02-27  Adam Barth  <abarth@webkit.org>
     2
     3        [Chromium] Enable threaded HTML parser by default in DumpRenderTree
     4        https://bugs.webkit.org/show_bug.cgi?id=110907
     5
     6        Reviewed by Eric Seidel.
     7
     8        This patch changes --enable-threaded-html-parser into
     9        --disable-threaded-html-parser and thereby enables the threaded HTML
     10        parser by default for the Chromium port.
     11
     12        * DumpRenderTree/chromium/DumpRenderTree.cpp:
     13        * DumpRenderTree/chromium/TestRunner/src/WebPreferences.cpp:
     14        (WebTestRunner::WebPreferences::reset):
     15        * DumpRenderTree/chromium/TestShell.cpp:
     16        (TestShell::TestShell):
     17
    1182013-02-27  Kiran Muppala  <cmuppala@apple.com>
    219
  • trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp

    r144150 r144262  
    6868static const char optionEnablePerTilePainting[] = "--enable-per-tile-painting";
    6969static const char optionEnableDeferredImageDecoding[] = "--enable-deferred-image-decoding";
    70 static const char optionEnableThreadedHTMLParser[] = "--enable-threaded-html-parser";
     70static const char optionDisableThreadedHTMLParser[] = "--disable-threaded-html-parser";
    7171
    7272static const char optionStressOpt[] = "--stress-opt";
     
    139139    bool threadedCompositingEnabled = false;
    140140    bool forceCompositingMode = false;
    141     bool threadedHTMLParser = false;
     141    bool threadedHTMLParser = true;
    142142    bool accelerated2DCanvasEnabled = false;
    143143    bool deferred2DCanvasEnabled = false;
     
    184184        else if (argument == optionForceCompositingMode)
    185185            forceCompositingMode = true;
    186         else if (argument == optionEnableThreadedHTMLParser)
    187             threadedHTMLParser = true;
     186        else if (argument == optionDisableThreadedHTMLParser)
     187            threadedHTMLParser = false;
    188188        else if (argument == optionEnableAccelerated2DCanvas)
    189189            accelerated2DCanvasEnabled = true;
  • trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebPreferences.cpp

    r144150 r144262  
    123123    acceleratedPaintingEnabled = false;
    124124    forceCompositingMode = false;
    125     threadedHTMLParser = false;
     125    threadedHTMLParser = true;
    126126    perTilePaintingEnabled = false;
    127127    acceleratedAnimationEnabled = false;
  • trunk/Tools/DumpRenderTree/chromium/TestShell.cpp

    r144150 r144262  
    114114    , m_threadedCompositingEnabled(false)
    115115    , m_forceCompositingMode(false)
    116     , m_threadedHTMLParser(false)
     116    , m_threadedHTMLParser(true)
    117117    , m_accelerated2dCanvasEnabled(false)
    118118    , m_deferred2dCanvasEnabled(false)
Note: See TracChangeset for help on using the changeset viewer.