Title: [144136] trunk
Revision
144136
Author
[email protected]
Date
2013-02-26 19:00:08 -0800 (Tue, 26 Feb 2013)

Log 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:

Modified Paths

Added Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (144135 => 144136)


--- trunk/LayoutTests/ChangeLog	2013-02-27 02:51:44 UTC (rev 144135)
+++ trunk/LayoutTests/ChangeLog	2013-02-27 03:00:08 UTC (rev 144136)
@@ -1,3 +1,33 @@
+2013-02-26  Adam Barth  <[email protected]>
+
+        [Chromium] Enable threaded HTML parser by default in DumpRenderTree
+        https://bugs.webkit.org/show_bug.cgi?id=110907
+
+        Reviewed by Eric Seidel.
+
+        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:
+
 2013-02-26  Stephen Chenney  <[email protected]>
 
         Crashes in fast/notifications/notifications-request-permission.html after r144126

Modified: trunk/LayoutTests/platform/chromium/TestExpectations (144135 => 144136)


--- trunk/LayoutTests/platform/chromium/TestExpectations	2013-02-27 02:51:44 UTC (rev 144135)
+++ trunk/LayoutTests/platform/chromium/TestExpectations	2013-02-27 03:00:08 UTC (rev 144136)
@@ -2996,10 +2996,11 @@
 webkit.org/b/72039 [ Android Linux Release ] fast/forms/form-associated-element-removal.html [ Missing Pass ]
 webkit.org/b/72039 [ Android Linux Release ] fast/forms/form-attribute-elements-order.html [ Missing Pass ]
 webkit.org/b/72039 [ Android Linux Release ] fast/forms/form-attribute-elements-order2.html [ Missing Pass ]
-webkit.org/b/72039 [ Debug ] http/tests/multipart/policy-ignore-crash.php [ Missing Pass ]
 webkit.org/b/72039 [ Release ] fast/forms/formaction-attribute.html [ Missing Pass ]
 webkit.org/b/78620 [ Android Linux Debug ] fast/forms/formaction-attribute.html [ Failure Pass Slow ]
 
+webkit.org/b/110929 http/tests/multipart/policy-ignore-crash.php [ Missing Failure ]
+
 webkit.org/b/70988 [ Mac Win Debug ] fast/forms/submit-to-blank-multiple-times.html [ Failure Pass ]
 webkit.org/b/70988 [ Mac Debug ] fast/overflow/003.xml [ Failure Pass ]
 

Modified: trunk/LayoutTests/platform/chromium/fast/images/support-broken-image-delegate-expected.txt (144135 => 144136)


--- trunk/LayoutTests/platform/chromium/fast/images/support-broken-image-delegate-expected.txt	2013-02-27 02:51:44 UTC (rev 144135)
+++ trunk/LayoutTests/platform/chromium/fast/images/support-broken-image-delegate-expected.txt	2013-02-27 03:00:08 UTC (rev 144136)
@@ -1,5 +1,4 @@
 resources/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)
-<unknown> - didFinishLoading
 resources/broken-image-with-invalid-format.png - didReceiveResponse <NSURLResponse resources/broken-image-with-invalid-format.png, http status code 0>
 resources/broken-image-with-invalid-format.png - shouldPaintBrokenImage: NO
 resources/broken-image-with-invalid-format.png - didFinishLoading

Added: trunk/LayoutTests/platform/chromium/fast/loader/main-document-url-for-non-http-loads-expected.txt (0 => 144136)


--- trunk/LayoutTests/platform/chromium/fast/loader/main-document-url-for-non-http-loads-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/chromium/fast/loader/main-document-url-for-non-http-loads-expected.txt	2013-02-27 03:00:08 UTC (rev 144136)
@@ -0,0 +1,6 @@
+resources/subframe-notify-done.html - willSendRequest <NSURLRequest URL resources/subframe-notify-done.html, main document URL main-document-url-for-non-http-loads.html, http method GET> redirectResponse (null)
+resources/subframe-notify-done.html - didReceiveResponse <NSURLResponse resources/subframe-notify-done.html, http status code 0>
+resources/subframe-notify-done.html - didFinishLoading
+Radar 6616664 - Non-HTTP/HTTPS loads need to have their main document URL set.
+When run in DumpRenderTree, this test will dump the resource load callback for the following subframe to make sure it had its main document URL set in its NSURLRequest.
+

Added: trunk/LayoutTests/platform/chromium/http/tests/loading/307-after-303-after-post-expected.txt (0 => 144136)


--- trunk/LayoutTests/platform/chromium/http/tests/loading/307-after-303-after-post-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/chromium/http/tests/loading/307-after-303-after-post-expected.txt	2013-02-27 03:00:08 UTC (rev 144136)
@@ -0,0 +1,20 @@
+main frame - didStartProvisionalLoadForFrame
+main frame - didCommitLoadForFrame
+main frame - didFinishDocumentLoadForFrame
+main frame - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/post-to-303-target.php 
+main frame - didHandleOnloadEventsForFrame
+main frame - didFinishLoadForFrame
+main frame - didStartProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/post-to-303-target.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/post-to-303-target.php, main document URL http://127.0.0.1:8000/loading/resources/post-to-303-target.php, http method POST> redirectResponse (null)
+http://127.0.0.1:8000/loading/resources/post-to-303-target.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/303-to-307-target.php, main document URL http://127.0.0.1:8000/loading/resources/303-to-307-target.php, http method GET> redirectResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/post-to-303-target.php, http status code 303>
+main frame - didReceiveServerRedirectForProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/post-to-303-target.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/307-post-output-target.php, main document URL http://127.0.0.1:8000/loading/resources/307-post-output-target.php, http method GET> redirectResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/303-to-307-target.php, http status code 307>
+main frame - didReceiveServerRedirectForProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/post-to-303-target.php - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/307-post-output-target.php, http status code 200>
+main frame - didCancelClientRedirectForFrame
+main frame - didCommitLoadForFrame
+http://127.0.0.1:8000/loading/resources/post-to-303-target.php - didFinishLoading
+main frame - didFinishDocumentLoadForFrame
+main frame - didHandleOnloadEventsForFrame
+main frame - didFinishLoadForFrame
+There were no POSTed form values.

Added: trunk/LayoutTests/platform/chromium/http/tests/misc/favicon-loads-with-images-disabled-expected.txt (0 => 144136)


--- trunk/LayoutTests/platform/chromium/http/tests/misc/favicon-loads-with-images-disabled-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/chromium/http/tests/misc/favicon-loads-with-images-disabled-expected.txt	2013-02-27 03:00:08 UTC (rev 144136)
@@ -0,0 +1,6 @@
+http://127.0.0.1:8000/misc/favicon-loads-with-images-disabled.html - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/misc/favicon-loads-with-images-disabled.html, main document URL http://127.0.0.1:8000/misc/favicon-loads-with-images-disabled.html, http method GET> redirectResponse (null)
+http://127.0.0.1:8000/misc/favicon-loads-with-images-disabled.html - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/misc/favicon-loads-with-images-disabled.html, http status code 200>
+http://127.0.0.1:8000/misc/favicon-loads-with-images-disabled.html - didFinishLoading
+Radar 6973106 and https://bugs.webkit.org/show_bug.cgi?id=27896 - Favicons still load when automatic image loading is disabled.
+This test uses DRT's resource load delegate callback mode to see if the favicon is loaded even when image loading is off.
+

Modified: trunk/LayoutTests/platform/chromium/http/tests/misc/will-send-request-returns-null-on-redirect-expected.txt (144135 => 144136)


--- trunk/LayoutTests/platform/chromium/http/tests/misc/will-send-request-returns-null-on-redirect-expected.txt	2013-02-27 02:51:44 UTC (rev 144135)
+++ trunk/LayoutTests/platform/chromium/http/tests/misc/will-send-request-returns-null-on-redirect-expected.txt	2013-02-27 03:00:08 UTC (rev 144136)
@@ -1,5 +1,4 @@
 http://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)
-<unknown> - didFinishLoading
 http://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>
 Returning null for this redirect
 http://127.0.0.1:8000/misc/resources/redirect-to-http-url.php - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -999, failing URL "(null)">

Added: trunk/LayoutTests/platform/chromium/http/tests/misc/window-dot-stop-expected.txt (0 => 144136)


--- trunk/LayoutTests/platform/chromium/http/tests/misc/window-dot-stop-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/chromium/http/tests/misc/window-dot-stop-expected.txt	2013-02-27 03:00:08 UTC (rev 144136)
@@ -0,0 +1,5 @@
+http://127.0.0.1:8000/incremental/slow-utf8-text.pl - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/incremental/slow-utf8-text.pl, main document URL http://127.0.0.1:8000/misc/window-dot-stop.html, http method GET> redirectResponse (null)
+http://127.0.0.1:8000/incremental/slow-utf8-text.pl - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -999, failing URL "http://127.0.0.1:8000/incremental/slow-utf8-text.pl">
+This tests for the successful use of window.stop()
+
+

Added: trunk/LayoutTests/platform/chromium/http/tests/security/XFrameOptions/x-frame-options-allowall-expected.txt (0 => 144136)


--- trunk/LayoutTests/platform/chromium/http/tests/security/XFrameOptions/x-frame-options-allowall-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/chromium/http/tests/security/XFrameOptions/x-frame-options-allowall-expected.txt	2013-02-27 03:00:08 UTC (rev 144136)
@@ -0,0 +1,11 @@
+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-allowall.cgi - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-allowall.cgi, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-allowall.html, http method GET> redirectResponse (null)
+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-allowall.cgi - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-allowall.cgi, http status code 200>
+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-allowall.cgi - didFinishLoading
+The frame below should load, and 'ALLOWALL' should be accepted as a valid header.
+
+
+
+--------
+Frame: '<!--framePath //<!--frame0-->-->'
+--------
+PASS: This text should show up.

Added: trunk/LayoutTests/platform/chromium/http/tests/security/XFrameOptions/x-frame-options-deny-expected.txt (0 => 144136)


--- trunk/LayoutTests/platform/chromium/http/tests/security/XFrameOptions/x-frame-options-deny-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/chromium/http/tests/security/XFrameOptions/x-frame-options-deny-expected.txt	2013-02-27 03:00:08 UTC (rev 144136)
@@ -0,0 +1,11 @@
+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny.cgi - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny.cgi, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-deny.html, http method GET> redirectResponse (null)
+CONSOLE MESSAGE: Refused to display 'http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny.cgi' in a frame because it set 'X-Frame-Options' to 'deny'.
+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny.cgi - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -999, failing URL "http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny.cgi">
+There should be no content in the iframe below
+
+
+
+--------
+Frame: '<!--framePath //<!--frame0-->-->'
+--------
+

Added: trunk/LayoutTests/platform/chromium/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-expected.txt (0 => 144136)


--- trunk/LayoutTests/platform/chromium/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/chromium/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-expected.txt	2013-02-27 03:00:08 UTC (rev 144136)
@@ -0,0 +1,12 @@
+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe.html - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe.html, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-deny-meta-tag.html, http method GET> redirectResponse (null)
+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe.html - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe.html, http status code 200>
+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe.html - didFinishLoading
+CONSOLE MESSAGE: Refused to display 'http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe.html' in a frame because it set 'X-Frame-Options' to 'deny'.
+There should be no content in the iframe below
+
+
+
+--------
+Frame: '<!--framePath //<!--frame0-->-->'
+--------
+

Added: trunk/LayoutTests/platform/chromium/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-in-body-expected.txt (0 => 144136)


--- trunk/LayoutTests/platform/chromium/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-in-body-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/chromium/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-in-body-expected.txt	2013-02-27 03:00:08 UTC (rev 144136)
@@ -0,0 +1,12 @@
+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-in-body.html - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-in-body.html, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-deny-meta-tag-in-body.html, http method GET> redirectResponse (null)
+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-in-body.html - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-in-body.html, http status code 200>
+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-in-body.html - didFinishLoading
+CONSOLE MESSAGE: Refused to display 'http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-in-body.html' in a frame because it set 'X-Frame-Options' to 'deny'.
+There should be no content in the iframe below
+
+
+
+--------
+Frame: '<!--framePath //<!--frame0-->-->'
+--------
+

Added: trunk/LayoutTests/platform/chromium/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-allow-expected.txt (0 => 144136)


--- trunk/LayoutTests/platform/chromium/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-allow-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/chromium/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-allow-expected.txt	2013-02-27 03:00:08 UTC (rev 144136)
@@ -0,0 +1,11 @@
+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-allow.html - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-allow.html, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-allow.html, http method GET> redirectResponse (null)
+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-allow.html - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-allow.html, http status code 200>
+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-allow.html - didFinishLoading
+There should be content in the iframe below
+
+
+
+--------
+Frame: '<!--framePath //<!--frame0-->-->'
+--------
+PASS: This should show up as the parent is in the same origin.

Added: trunk/LayoutTests/platform/chromium/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-deny-expected.txt (0 => 144136)


--- trunk/LayoutTests/platform/chromium/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-deny-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/chromium/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-deny-expected.txt	2013-02-27 03:00:08 UTC (rev 144136)
@@ -0,0 +1,12 @@
+http://localhost:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-deny.html - willSendRequest <NSURLRequest URL http://localhost:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-deny.html, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-deny.html, http method GET> redirectResponse (null)
+http://localhost:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-deny.html - didReceiveResponse <NSURLResponse http://localhost:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-deny.html, http status code 200>
+http://localhost:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-deny.html - didFinishLoading
+CONSOLE MESSAGE: Refused to display 'http://localhost:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-deny.html' in a frame because it set 'X-Frame-Options' to 'sameorigin'.
+There should be no content in the iframe below
+
+
+
+--------
+Frame: '<!--framePath //<!--frame0-->-->'
+--------
+

Added: trunk/LayoutTests/platform/chromium/http/tests/security/XFrameOptions/x-frame-options-invalid-expected.txt (0 => 144136)


--- trunk/LayoutTests/platform/chromium/http/tests/security/XFrameOptions/x-frame-options-invalid-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/chromium/http/tests/security/XFrameOptions/x-frame-options-invalid-expected.txt	2013-02-27 03:00:08 UTC (rev 144136)
@@ -0,0 +1,12 @@
+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-invalid.cgi - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-invalid.cgi, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-invalid.html, http method GET> redirectResponse (null)
+CONSOLE MESSAGE: Invalid 'X-Frame-Options' header encountered when loading 'http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-invalid.cgi': 'INVALID INVALID INVALID' is not a recognized directive. The header will be ignored.
+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-invalid.cgi - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-invalid.cgi, http status code 200>
+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-invalid.cgi - didFinishLoading
+The frame below should load, and a console message should be generated that notes the invalid header.
+
+
+
+--------
+Frame: '<!--framePath //<!--frame0-->-->'
+--------
+PASS: This text should show up.

Added: trunk/LayoutTests/platform/chromium/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow-expected.txt (0 => 144136)


--- trunk/LayoutTests/platform/chromium/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/chromium/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow-expected.txt	2013-02-27 03:00:08 UTC (rev 144136)
@@ -0,0 +1,11 @@
+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-parent-same-origin-allow.cgi - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-parent-same-origin-allow.cgi, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-parent-same-origin-allow.html, http method GET> redirectResponse (null)
+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-parent-same-origin-allow.cgi - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-parent-same-origin-allow.cgi, http status code 200>
+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-parent-same-origin-allow.cgi - didFinishLoading
+There should be content in the iframe below
+
+
+
+--------
+Frame: '<!--framePath //<!--frame0-->-->'
+--------
+PASS: This should show up as the parent is in the same origin.

Added: trunk/LayoutTests/platform/chromium/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-deny-expected.txt (0 => 144136)


--- trunk/LayoutTests/platform/chromium/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-deny-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/chromium/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-deny-expected.txt	2013-02-27 03:00:08 UTC (rev 144136)
@@ -0,0 +1,11 @@
+http://localhost:8000/security/XFrameOptions/resources/x-frame-options-parent-same-origin-allow.cgi - willSendRequest <NSURLRequest URL http://localhost:8000/security/XFrameOptions/resources/x-frame-options-parent-same-origin-allow.cgi, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-parent-same-origin-deny.html, http method GET> redirectResponse (null)
+CONSOLE MESSAGE: Refused to display 'http://localhost:8000/security/XFrameOptions/resources/x-frame-options-parent-same-origin-allow.cgi' in a frame because it set 'X-Frame-Options' to 'sameorigin'.
+http://localhost:8000/security/XFrameOptions/resources/x-frame-options-parent-same-origin-allow.cgi - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -999, failing URL "http://localhost:8000/security/XFrameOptions/resources/x-frame-options-parent-same-origin-allow.cgi">
+There should be no content in the iframe below
+
+
+
+--------
+Frame: '<!--framePath //<!--frame0-->-->'
+--------
+

Added: trunk/LayoutTests/platform/chromium/inspector/debugger/pause-in-inline-script-expected.txt (0 => 144136)


--- trunk/LayoutTests/platform/chromium/inspector/debugger/pause-in-inline-script-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/chromium/inspector/debugger/pause-in-inline-script-expected.txt	2013-02-27 03:00:08 UTC (rev 144136)
@@ -0,0 +1,18 @@
+Tests that main resource script text is correct when paused in inline script on reload. Bug 77548.
+
+Debugger was enabled.
+Did load front-end
+Paused: false
+didPauseAfterReload
+Source strings corresponding to the call stack:
+Script execution paused.
+Frame 0) line 6, content: </script><script>function f1() { debugger; }</script> (must be part of function 'f1')
+Frame 1) line 8, content: function f2() { return f1(); } (must be part of function 'f2')
+Frame 2) line 14, content:     return f2(); (must be part of function 'f3')
+Frame 3) line 16, content: f3(); (must be part of function '')
+Script execution resumed.
+didResume
+Page reloaded.
+didReload
+Debugger was disabled.
+

Added: trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-script-tag-1-expected.txt (0 => 144136)


--- trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-script-tag-1-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-script-tag-1-expected.txt	2013-02-27 03:00:08 UTC (rev 144136)
@@ -0,0 +1,36 @@
+CONSOLE MESSAGE: line 8: iframe loaded
+Tests the Timeline API instrumentation of an HTML script tag.
+
+
+ParseHTML
+----> ScheduleStyleRecalculation
+----> InvalidateLayout
+ParseHTML
+----> ScheduleStyleRecalculation
+----> EvaluateScript
+--------> TimeStamp : SCRIPT TAG
+EvaluateScript Properties:
+{
+    children : <object>
+    counters : <object>
+    data : {
+        lineNumber : <number>
+        url : <string>
+    }
+    endTime : <number>
+    frameId : <string>
+    startTime : <number>
+    type : "EvaluateScript"
+    usedHeapSize : <number>
+}
+ParseHTML
+----> InvalidateLayout
+ParseHTML
+----> InvalidateLayout
+----> EventDispatch
+--------> FunctionCall
+------------> FunctionCall
+----> MarkLoad
+----> Layout
+----> MarkDOMContent
+

Modified: trunk/LayoutTests/platform/chromium/security/block-test-no-port-expected.txt (144135 => 144136)


--- trunk/LayoutTests/platform/chromium/security/block-test-no-port-expected.txt	2013-02-27 02:51:44 UTC (rev 144135)
+++ trunk/LayoutTests/platform/chromium/security/block-test-no-port-expected.txt	2013-02-27 03:00:08 UTC (rev 144136)
@@ -1,6 +1,5 @@
 http://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)
-<unknown> - didFinishLoading
-http://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -138, failing URL "http://255.255.255.255/test.jpg">
+http://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1004, failing URL "http://255.255.255.255/test.jpg">
 This 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.
 
 

Deleted: trunk/LayoutTests/platform/chromium-mac/security/block-test-no-port-expected.txt (144135 => 144136)


--- trunk/LayoutTests/platform/chromium-mac/security/block-test-no-port-expected.txt	2013-02-27 02:51:44 UTC (rev 144135)
+++ trunk/LayoutTests/platform/chromium-mac/security/block-test-no-port-expected.txt	2013-02-27 03:00:08 UTC (rev 144136)
@@ -1,6 +0,0 @@
-http://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)
-<unknown> - didFinishLoading
-http://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1004, failing URL "http://255.255.255.255/test.jpg">
-This 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.
-
-

Modified: trunk/LayoutTests/platform/chromium-win/fast/images/support-broken-image-delegate-expected.txt (144135 => 144136)


--- trunk/LayoutTests/platform/chromium-win/fast/images/support-broken-image-delegate-expected.txt	2013-02-27 02:51:44 UTC (rev 144135)
+++ trunk/LayoutTests/platform/chromium-win/fast/images/support-broken-image-delegate-expected.txt	2013-02-27 03:00:08 UTC (rev 144136)
@@ -1,6 +1,5 @@
 CONSOLE MESSAGE: line 8: Uncaught TypeError: Object [object Object] has no method 'setShouldPaintBrokenImage'
 resources/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)
-<unknown> - didFinishLoading
 resources/broken-image-with-invalid-format.png - didReceiveResponse <NSURLResponse resources/broken-image-with-invalid-format.png, http status code 0>
 resources/broken-image-with-invalid-format.png - didFinishLoading
 CONSOLE MESSAGE: line 18: Uncaught TypeError: Object [object Object] has no method 'setShouldPaintBrokenImage'

Deleted: trunk/LayoutTests/platform/chromium-win/security/block-test-no-port-expected.txt (144135 => 144136)


--- trunk/LayoutTests/platform/chromium-win/security/block-test-no-port-expected.txt	2013-02-27 02:51:44 UTC (rev 144135)
+++ trunk/LayoutTests/platform/chromium-win/security/block-test-no-port-expected.txt	2013-02-27 03:00:08 UTC (rev 144136)
@@ -1,6 +0,0 @@
-http://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)
-<unknown> - didFinishLoading
-http://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1004, failing URL "http://255.255.255.255/test.jpg">
-This 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.
-
-

Modified: trunk/Tools/ChangeLog (144135 => 144136)


--- trunk/Tools/ChangeLog	2013-02-27 02:51:44 UTC (rev 144135)
+++ trunk/Tools/ChangeLog	2013-02-27 03:00:08 UTC (rev 144136)
@@ -1,3 +1,20 @@
+2013-02-26  Adam Barth  <[email protected]>
+
+        [Chromium] Enable threaded HTML parser by default in DumpRenderTree
+        https://bugs.webkit.org/show_bug.cgi?id=110907
+
+        Reviewed by Eric Seidel.
+
+        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):
+
 2013-02-26  Dirk Pranke  <[email protected]>
 
         [chromium] Re-enable the fixed version of freetype on linux

Modified: trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp (144135 => 144136)


--- trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp	2013-02-27 02:51:44 UTC (rev 144135)
+++ trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp	2013-02-27 03:00:08 UTC (rev 144136)
@@ -67,7 +67,7 @@
 static const char optionUseGraphicsContext3DImplementation[] = "--use-graphics-context-3d-implementation=";
 static const char optionEnablePerTilePainting[] = "--enable-per-tile-painting";
 static const char optionEnableDeferredImageDecoding[] = "--enable-deferred-image-decoding";
-static const char optionEnableThreadedHTMLParser[] = "--enable-threaded-html-parser";
+static const char optionDisableThreadedHTMLParser[] = "--disable-threaded-html-parser";
 
 static const char optionStressOpt[] = "--stress-opt";
 static const char optionStressDeopt[] = "--stress-deopt";
@@ -138,7 +138,7 @@
     bool softwareCompositingEnabled = false;
     bool threadedCompositingEnabled = false;
     bool forceCompositingMode = false;
-    bool threadedHTMLParser = false;
+    bool threadedHTMLParser = true;
     bool accelerated2DCanvasEnabled = false;
     bool deferred2DCanvasEnabled = false;
     bool acceleratedPaintingEnabled = false;
@@ -183,8 +183,8 @@
             threadedCompositingEnabled = true;
         else if (argument == optionForceCompositingMode)
             forceCompositingMode = true;
-        else if (argument == optionEnableThreadedHTMLParser)
-            threadedHTMLParser = true;
+        else if (argument == optionDisableThreadedHTMLParser)
+            threadedHTMLParser = false;
         else if (argument == optionEnableAccelerated2DCanvas)
             accelerated2DCanvasEnabled = true;
         else if (argument == optionEnableDeferred2DCanvas)

Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebPreferences.cpp (144135 => 144136)


--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebPreferences.cpp	2013-02-27 02:51:44 UTC (rev 144135)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebPreferences.cpp	2013-02-27 03:00:08 UTC (rev 144136)
@@ -122,7 +122,7 @@
     deferred2dCanvasEnabled = false;
     acceleratedPaintingEnabled = false;
     forceCompositingMode = false;
-    threadedHTMLParser = false;
+    threadedHTMLParser = true;
     perTilePaintingEnabled = false;
     acceleratedAnimationEnabled = false;
     deferredImageDecodingEnabled = false;

Modified: trunk/Tools/DumpRenderTree/chromium/TestShell.cpp (144135 => 144136)


--- trunk/Tools/DumpRenderTree/chromium/TestShell.cpp	2013-02-27 02:51:44 UTC (rev 144135)
+++ trunk/Tools/DumpRenderTree/chromium/TestShell.cpp	2013-02-27 03:00:08 UTC (rev 144136)
@@ -113,7 +113,7 @@
     , m_softwareCompositingEnabled(false)
     , m_threadedCompositingEnabled(false)
     , m_forceCompositingMode(false)
-    , m_threadedHTMLParser(false)
+    , m_threadedHTMLParser(true)
     , m_accelerated2dCanvasEnabled(false)
     , m_deferred2dCanvasEnabled(false)
     , m_acceleratedPaintingEnabled(false)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to