Diff
Modified: trunk/LayoutTests/ChangeLog (229763 => 229764)
--- trunk/LayoutTests/ChangeLog 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/ChangeLog 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,3 +1,19 @@
+2018-03-20 Chris Dumez <[email protected]>
+
+ Unreviewed, rolling out r229726 and r229763.
+
+ Caused some API test failures on iOS
+
+ Reverted changesets:
+
+ "Make policy decisions asynchronous"
+ https://bugs.webkit.org/show_bug.cgi?id=180568
+ https://trac.webkit.org/changeset/229726
+
+ "Rebaseline three webarchive tests for WK2 after r229726."
+ https://bugs.webkit.org/show_bug.cgi?id=180568
+ https://trac.webkit.org/changeset/229763
+
2018-03-20 Ryan Haddad <[email protected]>
Rebaseline three webarchive tests for WK2 after r229726.
Modified: trunk/LayoutTests/TestExpectations (229763 => 229764)
--- trunk/LayoutTests/TestExpectations 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/TestExpectations 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1719,9 +1719,6 @@
webkit.org/b/183390 http/wpt/html/browsers/history/the-location-interface/location-protocol-setter-non-broken-async-delegate.html [ DumpJSConsoleLogInStdErr Pass Failure ]
-# We sometimes get 2 console log messages about CSP instead of 1 due to preloading.
-http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-main-frame.html [ DumpJSConsoleLogInStdErr ]
-
media/event-queue-crash.html [ DumpJSConsoleLogInStdErr ]
webkit.org/b/172243 imported/w3c/web-platform-tests/IndexedDB/idbdatabase-createObjectStore-exception-order.htm [ Pass Failure ]
Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-main-frame-expected.txt (229763 => 229764)
--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-main-frame-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-main-frame-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -3,6 +3,7 @@
main frame - didHandleOnloadEventsForFrame
main frame - didFinishLoadForFrame
main frame - didCommitLoadForFrame
+CONSOLE MESSAGE: Blocked mixed content http://127.0.0.1:8000/security/mixedContent/resources/style.css because 'block-all-mixed-content' appears in the Content Security Policy.
main frame - didFinishDocumentLoadForFrame
main frame - didHandleOnloadEventsForFrame
main frame - didFinishLoadForFrame
Modified: trunk/LayoutTests/platform/ios/http/tests/loading/simple-subframe-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/ios/http/tests/loading/simple-subframe-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/ios/http/tests/loading/simple-subframe-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,7 +1,7 @@
main frame - didStartProvisionalLoadForFrame
main frame - didCommitLoadForFrame
+frame "f1" - didStartProvisionalLoadForFrame
main frame - didFinishDocumentLoadForFrame
-frame "f1" - didStartProvisionalLoadForFrame
frame "f1" - didCommitLoadForFrame
frame "f1" - didFinishDocumentLoadForFrame
frame "f1" - didHandleOnloadEventsForFrame
Copied: trunk/LayoutTests/platform/mac/webarchive/loading/mainresource-null-mimetype-crash-expected.txt (from rev 229763, trunk/LayoutTests/platform/wk2/webarchive/loading/mainresource-null-mimetype-crash-expected.txt) (0 => 229764)
--- trunk/LayoutTests/platform/mac/webarchive/loading/mainresource-null-mimetype-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/webarchive/loading/mainresource-null-mimetype-crash-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -0,0 +1,11 @@
+main frame - didStartProvisionalLoadForFrame
+main frame - didCommitLoadForFrame
+main frame - didFinishDocumentLoadForFrame
+frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
+main frame - didHandleOnloadEventsForFrame
+frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
+frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
+frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
+frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
+main frame - didFinishLoadForFrame
+
Modified: trunk/LayoutTests/platform/wk2/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/wk2/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/wk2/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,7 +1,7 @@
main frame - didStartProvisionalLoadForFrame
main frame - didCommitLoadForFrame
+frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
frame "<!--framePath //<!--frame0-->-->" - didReceiveServerRedirectForProvisionalLoadForFrame
127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with httpUsername:httpPassword
frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
Deleted: trunk/LayoutTests/platform/wk2/http/tests/loading/bad-server-subframe-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/wk2/http/tests/loading/bad-server-subframe-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/wk2/http/tests/loading/bad-server-subframe-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,10 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-frame "f1" - didStartProvisionalLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-frame "f1" - didFailProvisionalLoadWithError
-main frame - didFinishLoadForFrame
-This is a test of load callbacks. It is only useful inside the regression test tool.
-It also assumes there is no web server running locally on port 54321.
-
Modified: trunk/LayoutTests/platform/wk2/http/tests/loading/basic-auth-load-URL-with-consecutive-slashes-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/wk2/http/tests/loading/basic-auth-load-URL-with-consecutive-slashes-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/wk2/http/tests/loading/basic-auth-load-URL-with-consecutive-slashes-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,7 +1,7 @@
main frame - didStartProvisionalLoadForFrame
main frame - didCommitLoadForFrame
+frame "frame" - didStartProvisionalLoadForFrame
main frame - didFinishDocumentLoadForFrame
-frame "frame" - didStartProvisionalLoadForFrame
127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with webkit:rocks
frame "frame" - didCommitLoadForFrame
frame "frame" - didFinishDocumentLoadForFrame
Deleted: trunk/LayoutTests/platform/wk2/http/tests/loading/redirect-with-no-location-crash-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/wk2/http/tests/loading/redirect-with-no-location-crash-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/wk2/http/tests/loading/redirect-with-no-location-crash-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,12 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Test for https://bugs.webkit.org/show_bug.cgi?id=29293
-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-main frame - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
-
Deleted: trunk/LayoutTests/platform/wk2/http/tests/loading/server-redirect-for-provisional-load-caching-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/wk2/http/tests/loading/server-redirect-for-provisional-load-caching-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/wk2/http/tests/loading/server-redirect-for-provisional-load-caching-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,29 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-http://127.0.0.1:8000/loading/server-redirect-for-provisional-load-caching.html - didFinishLoading
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-http://127.0.0.1:8000/loading/resources/server-redirect.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/server-redirect.php, main document URL http://127.0.0.1:8000/loading/server-redirect-for-provisional-load-caching.html, http method GET> redirectResponse (null)
-http://127.0.0.1:8000/loading/resources/server-redirect.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/server-redirect-result.html, main document URL http://127.0.0.1:8000/loading/server-redirect-for-provisional-load-caching.html, http method GET> redirectResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/server-redirect.php, http status code 301>
-frame "<!--framePath //<!--frame0-->-->" - didReceiveServerRedirectForProvisionalLoadForFrame
-http://127.0.0.1:8000/loading/resources/server-redirect.php - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/server-redirect-result.html, http status code 200>
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/server-redirect.php
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
-http://127.0.0.1:8000/loading/resources/server-redirect.php - didFinishLoading
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-http://127.0.0.1:8000/loading/resources/server-redirect.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/server-redirect.php, main document URL http://127.0.0.1:8000/loading/server-redirect-for-provisional-load-caching.html, http method GET> redirectResponse (null)
-frame "<!--framePath //<!--frame0-->-->" - didReceiveServerRedirectForProvisionalLoadForFrame
-http://127.0.0.1:8000/loading/resources/server-redirect.php - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/server-redirect-result.html, http status code 200>
-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-http://127.0.0.1:8000/loading/resources/server-redirect.php - didFinishLoading
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-Test passes if the second redirection which is loaded from the cache dispatches didReceiveServerRedirectForProvisionalLoadForFrame.
-
-
Deleted: trunk/LayoutTests/platform/wk2/http/tests/loading/slow-parsing-subframe-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/wk2/http/tests/loading/slow-parsing-subframe-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/wk2/http/tests/loading/slow-parsing-subframe-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,12 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-frame "f1" - didStartProvisionalLoadForFrame
-frame "f1" - didCommitLoadForFrame
-frame "f1" - didFinishDocumentLoadForFrame
-frame "f1" - didHandleOnloadEventsForFrame
-main frame - didHandleOnloadEventsForFrame
-frame "f1" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
-This tests that we get frame load callbacks in the proper order when a subframe is parsed and created from within a timer callback.
-
Deleted: trunk/LayoutTests/platform/wk2/http/tests/misc/will-send-request-returns-null-on-redirect-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/wk2/http/tests/misc/will-send-request-returns-null-on-redirect-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/wk2/http/tests/misc/will-send-request-returns-null-on-redirect-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,8 +0,0 @@
-http://127.0.0.1:8000/misc/will-send-request-returns-null-on-redirect.html - didFinishLoading
-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)
-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>
-https://bugs.webkit.org/show_bug.cgi?id=27595
-This test checks to make sure that things behave as expected when the resource load delegate returns null in response to willSendRequest.
-
Deleted: trunk/LayoutTests/platform/wk2/http/tests/misc/window-dot-stop-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/wk2/http/tests/misc/window-dot-stop-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/wk2/http/tests/misc/window-dot-stop-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,4 +0,0 @@
-http://127.0.0.1:8000/misc/window-dot-stop.html - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -999, failing URL "http://127.0.0.1:8000/misc/window-dot-stop.html">
-This tests for the successful use of window.stop()
-
-
Deleted: trunk/LayoutTests/platform/wk2/http/tests/security/blocked-on-redirect-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/wk2/http/tests/security/blocked-on-redirect-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/blocked-on-redirect-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,5 +0,0 @@
-http://127.0.0.1:8000/security/blocked-on-redirect.html - didFinishLoading
-http://127.0.0.1:8000/resources/redirect.php?code=307&url="" - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/resources/redirect.php?code=307&url="" main document URL http://127.0.0.1:8000/security/blocked-on-redirect.html, http method GET> redirectResponse (null)
-CONSOLE MESSAGE: Not allowed to use restricted network port: http://localhost:25/security/resources/post-done.html
-http://127.0.0.1:8000/resources/redirect.php?code=307&url="" - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://localhost:25/security/resources/post-done.html">
-This test produces output in the console. Only the initial URL should be logged.
Deleted: trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/about-blank-iframe-in-main-frame-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/about-blank-iframe-in-main-frame-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/about-blank-iframe-in-main-frame-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,19 +0,0 @@
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame1-->-->" - didFinishLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-This test opens a window iframe that loads an about:blank iframe. We should *not* trigger a mixed content callback because the about:blank iframes cannot be corrupted by active network attackers.
Deleted: trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/data-url-iframe-in-main-frame-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/data-url-iframe-in-main-frame-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/data-url-iframe-in-main-frame-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,14 +0,0 @@
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-main frame - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
-This test opens a window iframe that loads a data URL iframe. We should *not* trigger a mixed content callback because the data URL cannot be corrupted by active network attackers.
Deleted: trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/data-url-script-in-iframe-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/data-url-script-in-iframe-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/data-url-script-in-iframe-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,11 +0,0 @@
-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-main frame - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
-This test loads a secure iframe that loads a data URL script. We should *not* trigger a mixed content callback because the data URL cannot be corrupted by an active network attacker.
-
-
Deleted: trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/empty-url-plugin-in-frame-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/empty-url-plugin-in-frame-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/empty-url-plugin-in-frame-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,11 +0,0 @@
-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-main frame - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
-This test loads a secure iframe that loads a plugin without a URL. We should *not* get a mixed content callback because the plug-in cannot be controlled by an active network attacker.
-
-
Deleted: trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-css-in-iframe-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-css-in-iframe-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-css-in-iframe-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,13 +0,0 @@
-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-CONSOLE MESSAGE: line 4: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-css.html was not allowed to run insecure content from http://127.0.0.1:8080/security/mixedContent/resources/style.css.
-
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-main frame - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
-This test loads a secure iframe that loads an insecure style sheet. We should trigger a mixed content callback because an active network attacker can use CSS3 to breach the confidentiality of the HTTPS security origin.
-
-
Deleted: trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-css-in-main-frame-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-css-in-main-frame-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-css-in-main-frame-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,11 +0,0 @@
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-CONSOLE MESSAGE: line 4: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-css.html was not allowed to run insecure content from http://127.0.0.1:8080/security/mixedContent/resources/style.css.
-
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-This test opens a window that loads an insecure style sheet. We should trigger a mixed content callback because the main frame in the window is HTTPS but is running insecure content.
Deleted: trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-css-with-secure-cookies-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-css-with-secure-cookies-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-css-with-secure-cookies-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,13 +0,0 @@
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-CONSOLE MESSAGE: line 6: secureCookie=yes
-CONSOLE MESSAGE: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-css-secure-cookies.html was allowed to display insecure content from http://127.0.0.1:8080/security/resources/greenbox-hotspot5-4.cur.
-
-didDisplayInsecureContent
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-This test opens a window that loads a secure style sheet with insecure cursor content after reading secure cookies. This should be allowed because loading of the insecure cursor does not pose a security risk since it can only affect the display.
Deleted: trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-executable-css-with-secure-cookies-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-executable-css-with-secure-cookies-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-executable-css-with-secure-cookies-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,12 +0,0 @@
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-CONSOLE MESSAGE: line 6: secureCookie=yes
-CONSOLE MESSAGE: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-executable-css-with-secure-cookies.html was not allowed to run insecure content from http://127.0.0.1:8080/security/resources/insecure.css.
-
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-This test opens a window that loads a secure style sheet with insecure content after reading secure cookies. This should block loading of the insecure content since secure cookie was read.
Deleted: trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-form-in-iframe-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-form-in-iframe-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-form-in-iframe-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,11 +0,0 @@
-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-main frame - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
-This test loads a secure iframe that has a form with an insecure action. We should *not* get a mixed content callback because the main frame is HTTP and the form doesn't contaminate the child iframe's security origin with mixed content.
-
-
Deleted: trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-form-in-main-frame-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-form-in-main-frame-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-form-in-main-frame-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,12 +0,0 @@
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-CONSOLE MESSAGE: line 3: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-form.html contains a form which targets an insecure URL http://127.0.0.1:8080/resources/doesnotexist.
-
-didDisplayInsecureContent
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-This test opens a window that has a form with an non-https action. We should trigger a mixed content callback because the main frame in the window is HTTPS but is running insecure content.
Deleted: trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-iframe-in-iframe-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-iframe-in-iframe-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-iframe-in-iframe-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,16 +0,0 @@
-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-main frame - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
-This test loads a secure iframe that loads an insecure iframe. We should *not* get a mixed content callback becase the main frame is HTTP and the grandchild iframe doesn't contaminate the child iframe's security origin with mixed content.
-
-
Deleted: trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-iframe-in-main-frame-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-iframe-in-main-frame-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-iframe-in-main-frame-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,13 +0,0 @@
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-CONSOLE MESSAGE: [blocked] The page at about:blank was not allowed to display insecure content from http://127.0.0.1:8080/security/mixedContent/resources/boring.html.
-
-main frame - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError
-main frame - didFinishLoadForFrame
-This test opens a window that loads an insecure iframe. We should trigger a mixed content callback because the main frame in the window is HTTPS but is displaying insecure content.
Deleted: trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-image-in-iframe-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-image-in-iframe-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-image-in-iframe-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,11 +0,0 @@
-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-main frame - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
-This test loads a secure iframe that loads an insecure image. We should *not* get a mixed content callback becase the main frame is HTTP and the image doesn't contaminate the child iframe's security origin with mixed content.
-
-
Deleted: trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/_javascript_-url-form-in-main-frame-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/_javascript_-url-form-in-main-frame-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/_javascript_-url-form-in-main-frame-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,9 +0,0 @@
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-This test opens a window that has a form with an action that is a _javascript_: url. We should *not* trigger a mixed content callback because the _javascript_: URL cannot be corrupted by active network attackers.
Deleted: trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,13 +0,0 @@
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-CONSOLE MESSAGE: [blocked] The page at about:blank was not allowed to display insecure content from http://127.0.0.1:8080/resources/redirect.php?url=""
-
-main frame - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError
-main frame - didFinishLoadForFrame
-This test opens a window that loads an insecure iframe (via a tricky redirect). We should trigger a mixed content callback because the main frame in the window is HTTPS but is displaying content that can be controlled by an active network attacker.
Deleted: trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,13 +0,0 @@
-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-CONSOLE MESSAGE: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-redirect-http-to-https-script.html was not allowed to run insecure content from http://127.0.0.1:8080/resources/redirect.php?url=""
-
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-main frame - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
-This test loads a secure iframe that loads an insecure script (but with a tricky redirect). We should trigger a mixed content callback because an active network attacker could have redirected the script load to https://attacker.com.
-
-
Deleted: trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,13 +0,0 @@
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-CONSOLE MESSAGE: [blocked] The page at about:blank was not allowed to display insecure content from http://127.0.0.1:8080/security/mixedContent/resources/boring.html.
-
-main frame - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError
-main frame - didFinishLoadForFrame
-This test opens a window that loads an insecure iframe (via a tricky redirect). We should trigger a mixed content callback because the main frame in the window is HTTPS but is displaying content that can be controlled by an active network attacker.
Deleted: trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-image-secure-cookies-block-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-image-secure-cookies-block-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-image-secure-cookies-block-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,13 +0,0 @@
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-CONSOLE MESSAGE: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-redirect-https-to-http-image-secure-cookie-block.html was allowed to display insecure content from http://127.0.0.1:8080/security/resources/compass.jpg.
-
-didDisplayInsecureContent
-CONSOLE MESSAGE: line 8: secureCookie=yes
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-This test opens a window that loads an insecure image (via a tricky redirect) and then tries to read a secure cookie. This should block the secure cookie from being read because insecure content was loaded while loading a main frame.
Deleted: trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-image-secure-cookies-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-image-secure-cookies-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-image-secure-cookies-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,13 +0,0 @@
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-CONSOLE MESSAGE: line 4: secureCookie=yes
-main frame - didFinishDocumentLoadForFrame
-CONSOLE MESSAGE: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-redirect-https-to-http-image-secure-cookie.html was allowed to display insecure content from http://127.0.0.1:8080/security/resources/compass.jpg.
-
-didDisplayInsecureContent
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-This test opens a window that reads a secure cookie and then loads an insecure image (via a tricky redirect). This should not block the insecure image from loading even though a secure cookie was accessed, because an insecure image can only affect pixels on screen, not expose private data.
Deleted: trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-script-in-iframe-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-script-in-iframe-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-script-in-iframe-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,13 +0,0 @@
-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-CONSOLE MESSAGE: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-redirect-https-to-http-script.html was not allowed to run insecure content from http://127.0.0.1:8080/security/mixedContent/resources/script.js.
-
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-main frame - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
-This test loads a secure iframe that loads an insecure script (but with a tricky redirect). We should trigger a mixed content callback because an active network attacker can end up controling the script.
-
-
Deleted: trunk/LayoutTests/platform/wk2/inspector/page/frameScheduledNavigation-expected.txt (229763 => 229764)
--- trunk/LayoutTests/platform/wk2/inspector/page/frameScheduledNavigation-expected.txt 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/LayoutTests/platform/wk2/inspector/page/frameScheduledNavigation-expected.txt 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,5 +0,0 @@
-
-Scheduled navigation with delay 0
-Cleared scheduled navigation
-Started loading
-
Modified: trunk/Source/WebKit/ChangeLog (229763 => 229764)
--- trunk/Source/WebKit/ChangeLog 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/Source/WebKit/ChangeLog 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,3 +1,19 @@
+2018-03-20 Chris Dumez <[email protected]>
+
+ Unreviewed, rolling out r229726 and r229763.
+
+ Caused some API test failures on iOS
+
+ Reverted changesets:
+
+ "Make policy decisions asynchronous"
+ https://bugs.webkit.org/show_bug.cgi?id=180568
+ https://trac.webkit.org/changeset/229726
+
+ "Rebaseline three webarchive tests for WK2 after r229726."
+ https://bugs.webkit.org/show_bug.cgi?id=180568
+ https://trac.webkit.org/changeset/229763
+
2018-03-20 Brent Fulgham <[email protected]>
[iOS] Grant IOKit preference access for the Home button
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (229763 => 229764)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-03-20 17:08:05 UTC (rev 229764)
@@ -2335,7 +2335,8 @@
DownloadID downloadID = { };
if (action == PolicyAction::Download) {
// Create a download proxy.
- auto* download = m_process->processPool().createDownloadProxy(m_decidePolicyForResponseRequest, this);
+ const ResourceRequest& downloadRequest = m_decidePolicyForResponseRequest ? *m_decidePolicyForResponseRequest : ResourceRequest();
+ DownloadProxy* download = m_process->processPool().createDownloadProxy(downloadRequest, this);
if (navigation) {
download->setWasUserInitiated(navigation->wasUserInitiated());
download->setRedirectChain(navigation->takeRedirectChain());
@@ -2343,9 +2344,27 @@
downloadID = download->downloadID();
handleDownloadRequest(download);
- m_decidePolicyForResponseRequest = { };
}
+ // If we received a policy decision while in decidePolicyForResponse the decision will
+ // be sent back to the web process by decidePolicyForResponse.
+ if (m_inDecidePolicyForResponseSync) {
+ m_syncMimeTypePolicyActionIsValid = true;
+ m_syncMimeTypePolicyAction = action;
+ m_syncMimeTypePolicyDownloadID = downloadID;
+ return;
+ }
+
+ // If we received a policy decision while in decidePolicyForNavigationAction the decision will
+ // be sent back to the web process by decidePolicyForNavigationAction.
+ if (m_inDecidePolicyForNavigationAction) {
+ m_syncNavigationActionPolicyActionIsValid = true;
+ m_syncNavigationActionPolicyAction = action;
+ m_syncNavigationActionPolicyDownloadID = downloadID;
+ m_syncNavigationActionPolicyWebsitePolicies = WTFMove(websitePolicies);
+ return;
+ }
+
m_process->send(Messages::WebPage::DidReceivePolicyDecision(frame.frameID(), listenerID, action, navigation ? navigation->navigationID() : 0, downloadID, websitePolicies), m_pageID);
}
@@ -3747,7 +3766,7 @@
m_frameSetLargestFrame = value ? m_mainFrame : 0;
}
-void WebPageProxy::decidePolicyForNavigationAction(uint64_t frameID, const SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, NavigationActionData&& navigationActionData, const FrameInfoData& originatingFrameInfoData, uint64_t originatingPageID, const WebCore::ResourceRequest& originalRequest, ResourceRequest&& request, uint64_t listenerID, const UserData& userData)
+void WebPageProxy::decidePolicyForNavigationAction(uint64_t frameID, const SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, NavigationActionData&& navigationActionData, const FrameInfoData& originatingFrameInfoData, uint64_t originatingPageID, const WebCore::ResourceRequest& originalRequest, ResourceRequest&& request, uint64_t listenerID, const UserData& userData, bool& receivedPolicyAction, uint64_t& newNavigationID, WebCore::PolicyAction& policyAction, DownloadID& downloadID, std::optional<WebsitePoliciesData>& websitePolicies)
{
PageClientProtector protector(m_pageClient);
@@ -3762,7 +3781,6 @@
MESSAGE_CHECK_URL(request.url());
MESSAGE_CHECK_URL(originalRequest.url());
- uint64_t newNavigationID { 0 };
Ref<WebFramePolicyListenerProxy> listener = frame->setUpPolicyListenerProxy(listenerID);
if (!navigationID) {
auto navigation = m_navigationState->createLoadRequestNavigation(ResourceRequest(request));
@@ -3772,7 +3790,6 @@
listener->setNavigation(WTFMove(navigation));
} else {
auto& navigation = m_navigationState->navigation(navigationID);
- newNavigationID = navigationID;
navigation.setWasUserInitiated(!!navigationActionData.userGestureTokenIdentifier);
navigation.setShouldForceDownload(!navigationActionData.downloadAttribute.isNull());
listener->setNavigation(navigation);
@@ -3779,10 +3796,18 @@
}
#if ENABLE(CONTENT_FILTERING)
- if (frame->didHandleContentFilterUnblockNavigation(request))
- return receivedPolicyDecision(PolicyAction::Ignore, *frame, listenerID, &m_navigationState->navigation(newNavigationID), { });
+ if (frame->didHandleContentFilterUnblockNavigation(request)) {
+ receivedPolicyAction = true;
+ policyAction = PolicyAction::Ignore;
+ return;
+ }
#endif
+ ASSERT(!m_inDecidePolicyForNavigationAction);
+
+ m_inDecidePolicyForNavigationAction = true;
+ m_syncNavigationActionPolicyActionIsValid = false;
+
WebFrameProxy* originatingFrame = m_process->webFrame(originatingFrameInfoData.frameID);
if (m_navigationClient) {
@@ -3803,6 +3828,15 @@
m_policyClient->decidePolicyForNavigationAction(*this, frame, WTFMove(navigationActionData), originatingFrame, originalRequest, WTFMove(request), WTFMove(listener), m_process->transformHandlesToObjects(userData.object()).get());
m_shouldSuppressAppLinksInNextNavigationPolicyDecision = false;
+ m_inDecidePolicyForNavigationAction = false;
+
+ // Check if we received a policy decision already. If we did, we can just pass it back.
+ receivedPolicyAction = m_syncNavigationActionPolicyActionIsValid;
+ if (m_syncNavigationActionPolicyActionIsValid) {
+ policyAction = m_syncNavigationActionPolicyAction;
+ downloadID = m_syncNavigationActionPolicyDownloadID;
+ websitePolicies = WTFMove(m_syncNavigationActionPolicyWebsitePolicies);
+ }
}
void WebPageProxy::decidePolicyForNewWindowAction(uint64_t frameID, const SecurityOriginData& frameSecurityOrigin, NavigationActionData&& navigationActionData, ResourceRequest&& request, const String& frameName, uint64_t listenerID, const UserData& userData)
@@ -3834,8 +3868,6 @@
{
PageClientProtector protector(m_pageClient);
- m_decidePolicyForResponseRequest = request;
-
WebFrameProxy* frame = m_process->webFrame(frameID);
MESSAGE_CHECK(frame);
MESSAGE_CHECK_URL(request.url());
@@ -3852,6 +3884,29 @@
m_policyClient->decidePolicyForResponse(*this, *frame, response, request, canShowMIMEType, WTFMove(listener), m_process->transformHandlesToObjects(userData.object()).get());
}
+void WebPageProxy::decidePolicyForResponseSync(uint64_t frameID, const SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, const ResourceResponse& response, const ResourceRequest& request, bool canShowMIMEType, uint64_t listenerID, const UserData& userData, bool& receivedPolicyAction, WebCore::PolicyAction& policyAction, DownloadID& downloadID)
+{
+ PageClientProtector protector(m_pageClient);
+
+ ASSERT(!m_inDecidePolicyForResponseSync);
+
+ m_inDecidePolicyForResponseSync = true;
+ m_decidePolicyForResponseRequest = &request;
+ m_syncMimeTypePolicyActionIsValid = false;
+
+ decidePolicyForResponse(frameID, frameSecurityOrigin, navigationID, response, request, canShowMIMEType, listenerID, userData);
+
+ m_inDecidePolicyForResponseSync = false;
+ m_decidePolicyForResponseRequest = nullptr;
+
+ // Check if we received a policy decision already. If we did, we can just pass it back.
+ receivedPolicyAction = m_syncMimeTypePolicyActionIsValid;
+ if (m_syncMimeTypePolicyActionIsValid) {
+ policyAction = m_syncMimeTypePolicyAction;
+ downloadID = m_syncMimeTypePolicyDownloadID;
+ }
+}
+
void WebPageProxy::unableToImplementPolicy(uint64_t frameID, const ResourceError& error, const UserData& userData)
{
PageClientProtector protector(m_pageClient);
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (229763 => 229764)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1367,9 +1367,10 @@
void didDestroyNavigation(uint64_t navigationID);
- void decidePolicyForNavigationAction(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, NavigationActionData&&, const FrameInfoData&, uint64_t originatingPageID, const WebCore::ResourceRequest& originalRequest, WebCore::ResourceRequest&&, uint64_t listenerID, const UserData&);
+ void decidePolicyForNavigationAction(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, NavigationActionData&&, const FrameInfoData&, uint64_t originatingPageID, const WebCore::ResourceRequest& originalRequest, WebCore::ResourceRequest&&, uint64_t listenerID, const UserData&, bool& receivedPolicyAction, uint64_t& newNavigationID, WebCore::PolicyAction&, DownloadID&, std::optional<WebsitePoliciesData>&);
void decidePolicyForNewWindowAction(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, NavigationActionData&&, WebCore::ResourceRequest&&, const String& frameName, uint64_t listenerID, const UserData&);
void decidePolicyForResponse(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, bool canShowMIMEType, uint64_t listenerID, const UserData&);
+ void decidePolicyForResponseSync(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, bool canShowMIMEType, uint64_t listenerID, const UserData&, bool& receivedPolicyAction, WebCore::PolicyAction&, DownloadID&);
void unableToImplementPolicy(uint64_t frameID, const WebCore::ResourceError&, const UserData&);
void willSubmitForm(uint64_t frameID, uint64_t sourceFrameID, const Vector<std::pair<String, String>>& textFieldValues, uint64_t listenerID, const UserData&);
@@ -1917,7 +1918,17 @@
bool m_isInPrintingMode { false };
bool m_isPerformingDOMPrintOperation { false };
- WebCore::ResourceRequest m_decidePolicyForResponseRequest;
+ bool m_inDecidePolicyForResponseSync { false };
+ const WebCore::ResourceRequest* m_decidePolicyForResponseRequest { nullptr };
+ bool m_syncMimeTypePolicyActionIsValid { false };
+ WebCore::PolicyAction m_syncMimeTypePolicyAction { WebCore::PolicyAction::Use };
+ DownloadID m_syncMimeTypePolicyDownloadID { 0 };
+ bool m_inDecidePolicyForNavigationAction { false };
+ bool m_syncNavigationActionPolicyActionIsValid { false };
+ WebCore::PolicyAction m_syncNavigationActionPolicyAction { WebCore::PolicyAction::Use };
+ DownloadID m_syncNavigationActionPolicyDownloadID { 0 };
+ std::optional<WebsitePoliciesData> m_syncNavigationActionPolicyWebsitePolicies;
+
bool m_shouldSuppressAppLinksInNextNavigationPolicyDecision { false };
Deque<NativeWebKeyboardEvent> m_keyEventQueue;
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in (229763 => 229764)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in 2018-03-20 17:08:05 UTC (rev 229764)
@@ -98,8 +98,8 @@
#endif
# Policy messages
- DecidePolicyForResponse(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, uint64_t navigationID, WebCore::ResourceResponse response, WebCore::ResourceRequest request, bool canShowMIMEType, uint64_t listenerID, WebKit::UserData userData)
- DecidePolicyForNavigationAction(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, uint64_t navigationID, struct WebKit::NavigationActionData navigationActionData, struct WebKit::FrameInfoData originatingFrameInfoData, uint64_t originatingPageID, WebCore::ResourceRequest originalRequest, WebCore::ResourceRequest request, uint64_t listenerID, WebKit::UserData userData)
+ DecidePolicyForResponseSync(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, uint64_t navigationID, WebCore::ResourceResponse response, WebCore::ResourceRequest request, bool canShowMIMEType, uint64_t listenerID, WebKit::UserData userData) -> (bool receivedPolicyAction, enum WebCore::PolicyAction policyAction, WebKit::DownloadID downloadID)
+ DecidePolicyForNavigationAction(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, uint64_t navigationID, struct WebKit::NavigationActionData navigationActionData, struct WebKit::FrameInfoData originatingFrameInfoData, uint64_t originatingPageID, WebCore::ResourceRequest originalRequest, WebCore::ResourceRequest request, uint64_t listenerID, WebKit::UserData userData) -> (bool receivedPolicyAction, uint64_t newNavigationID, enum WebCore::PolicyAction policyAction, WebKit::DownloadID downloadID, std::optional<WebKit::WebsitePoliciesData> websitePolicies)
DecidePolicyForNewWindowAction(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, struct WebKit::NavigationActionData navigationActionData, WebCore::ResourceRequest request, String frameName, uint64_t listenerID, WebKit::UserData userData)
UnableToImplementPolicy(uint64_t frameID, WebCore::ResourceError error, WebKit::UserData userData)
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (229763 => 229764)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2018-03-20 17:08:05 UTC (rev 229764)
@@ -748,9 +748,19 @@
Ref<WebFrame> protector(*m_frame);
uint64_t listenerID = m_frame->setUpPolicyListener(WTFMove(function), WebFrame::ForNavigationAction::No);
+ bool receivedPolicyAction;
+ PolicyAction policyAction;
+ DownloadID downloadID;
+
auto navigationID = static_cast<WebDocumentLoader&>(*policyDocumentLoader).navigationID();
- if (!webPage->send(Messages::WebPageProxy::DecidePolicyForResponse(m_frame->frameID(), SecurityOriginData::fromFrame(coreFrame), navigationID, response, request, canShowMIMEType, listenerID, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get()))))
+ if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForResponseSync(m_frame->frameID(), SecurityOriginData::fromFrame(coreFrame), navigationID, response, request, canShowMIMEType, listenerID, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())), Messages::WebPageProxy::DecidePolicyForResponseSync::Reply(receivedPolicyAction, policyAction, downloadID), Seconds::infinity(), IPC::SendSyncOption::InformPlatformProcessWillSuspend)) {
m_frame->didReceivePolicyDecision(listenerID, PolicyAction::Ignore, 0, { }, { });
+ return;
+ }
+
+ // We call this synchronously because CFNetwork can only convert a loading connection to a download from its didReceiveResponse callback.
+ if (receivedPolicyAction)
+ m_frame->didReceivePolicyDecision(listenerID, policyAction, 0, downloadID, { });
}
void WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction(const NavigationAction& navigationAction, const ResourceRequest& request, FormState* formState, const String& frameName, FramePolicyFunction&& function)
@@ -833,6 +843,10 @@
}
uint64_t listenerID = m_frame->setUpPolicyListener(WTFMove(function), WebFrame::ForNavigationAction::Yes);
+ bool receivedPolicyAction;
+ uint64_t newNavigationID;
+ PolicyAction policyAction;
+ DownloadID downloadID;
ASSERT(navigationAction.sourceDocument());
const Document& sourceDocument = *navigationAction.sourceDocument();
@@ -871,8 +885,15 @@
// Notify the UIProcess.
Ref<WebFrame> protect(*m_frame);
- if (!webPage->send(Messages::WebPageProxy::DecidePolicyForNavigationAction(m_frame->frameID(), SecurityOriginData::fromFrame(coreFrame), documentLoader->navigationID(), navigationActionData, originatingFrameInfoData, originatingFrame && originatingFrame->page() ? originatingFrame->page()->pageID() : 0, navigationAction.resourceRequest(), request, listenerID, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get()))))
+ std::optional<WebsitePoliciesData> websitePolicies;
+ if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForNavigationAction(m_frame->frameID(), SecurityOriginData::fromFrame(coreFrame), documentLoader->navigationID(), navigationActionData, originatingFrameInfoData, originatingFrame && originatingFrame->page() ? originatingFrame->page()->pageID() : 0, navigationAction.resourceRequest(), request, listenerID, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())), Messages::WebPageProxy::DecidePolicyForNavigationAction::Reply(receivedPolicyAction, newNavigationID, policyAction, downloadID, websitePolicies))) {
m_frame->didReceivePolicyDecision(listenerID, PolicyAction::Ignore, 0, { }, { });
+ return;
+ }
+
+ // We call this synchronously because WebCore cannot gracefully handle a frame load without a synchronous navigation policy reply.
+ if (receivedPolicyAction)
+ m_frame->didReceivePolicyDecision(listenerID, policyAction, newNavigationID, downloadID, WTFMove(websitePolicies));
}
void WebFrameLoaderClient::cancelPolicyCheck()
Modified: trunk/Tools/ChangeLog (229763 => 229764)
--- trunk/Tools/ChangeLog 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/Tools/ChangeLog 2018-03-20 17:08:05 UTC (rev 229764)
@@ -1,3 +1,19 @@
+2018-03-20 Chris Dumez <[email protected]>
+
+ Unreviewed, rolling out r229726 and r229763.
+
+ Caused some API test failures on iOS
+
+ Reverted changesets:
+
+ "Make policy decisions asynchronous"
+ https://bugs.webkit.org/show_bug.cgi?id=180568
+ https://trac.webkit.org/changeset/229726
+
+ "Rebaseline three webarchive tests for WK2 after r229726."
+ https://bugs.webkit.org/show_bug.cgi?id=180568
+ https://trac.webkit.org/changeset/229763
+
2018-03-20 Zalan Bujtas <[email protected]>
[LayoutReloaded] Move Display.Box handling from FormattingContext to FormattingState
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/LoadAlternateHTMLString.mm (229763 => 229764)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/LoadAlternateHTMLString.mm 2018-03-20 16:52:00 UTC (rev 229763)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/LoadAlternateHTMLString.mm 2018-03-20 17:08:05 UTC (rev 229764)
@@ -116,9 +116,8 @@
isDone = false;
TestWebKitAPI::Util::run(&isDone);
- // In success, we should only start 2 provisional loads: 1 for the second loadRequest, and 1 for the _loadAlternateHTMLString.
- // The second loadRequest cancels the first one before its provisional load starts.
- EXPECT_EQ(2, provisionalLoadCount);
+ // In success, we should only start 3 provisional loads: 2 for the loadRequest, and *only 1* for the _loadAlternateHTMLString.
+ EXPECT_EQ(3, provisionalLoadCount);
}
}
