[Content Filtering] Load blocked pages more like other error pages are loaded
<rdar://problem/26014076>
Created attachment 282937 [details] Patch
Attachment 282937 [details] did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm:274: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 55 files If any of these errors are false positives, please file a bug against check-webkit-style.
Comment on attachment 282937 [details] Patch Attachment 282937 [details] did not pass mac-ews (mac): Output: http://webkit-queues.webkit.org/results/1637379 New failing tests: contentfiltering/allow-after-will-send-request.html contentfiltering/allow-never.html contentfiltering/allow-after-add-data.html contentfiltering/allow-after-finished-adding-data.html contentfiltering/block-never.html contentfiltering/allow-after-response.html
Created attachment 282945 [details] Archive of layout-test-results from ews101 for mac-yosemite The attached test failures were seen while running run-webkit-tests on the mac-ews. Bot: ews101 Port: mac-yosemite Platform: Mac OS X 10.10.5
Comment on attachment 282937 [details] Patch Attachment 282937 [details] did not pass ios-sim-ews (ios-simulator-wk2): Output: http://webkit-queues.webkit.org/results/1637354 New failing tests: contentfiltering/allow-after-will-send-request.html contentfiltering/allow-never.html contentfiltering/block-after-response-then-deny-unblock.html contentfiltering/allow-after-add-data.html contentfiltering/block-after-finished-adding-data-then-deny-unblock.html contentfiltering/block-after-will-send-request-then-allow-unblock.html contentfiltering/block-after-add-data.html contentfiltering/allow-after-finished-adding-data.html contentfiltering/block-after-add-data-then-deny-unblock.html contentfiltering/block-after-will-send-request-then-deny-unblock.html contentfiltering/block-after-add-data-then-allow-unblock.html contentfiltering/block-after-response.html contentfiltering/block-after-response-then-allow-unblock.html contentfiltering/block-after-will-send-request.html contentfiltering/block-after-finished-adding-data.html contentfiltering/block-never.html contentfiltering/block-after-finished-adding-data-then-allow-unblock.html contentfiltering/allow-after-response.html
Created attachment 282946 [details] Archive of layout-test-results from ews125 for ios-simulator-wk2 The attached test failures were seen while running run-webkit-tests on the ios-sim-ews. Bot: ews125 Port: ios-simulator-wk2 Platform: Mac OS X 10.11.4
Comment on attachment 282937 [details] Patch Attachment 282937 [details] did not pass mac-wk2-ews (mac-wk2): Output: http://webkit-queues.webkit.org/results/1637378 New failing tests: contentfiltering/block-never.html contentfiltering/allow-after-will-send-request.html contentfiltering/allow-never.html contentfiltering/block-after-response-then-deny-unblock.html contentfiltering/allow-after-add-data.html contentfiltering/block-after-finished-adding-data-then-deny-unblock.html contentfiltering/block-after-will-send-request-then-allow-unblock.html contentfiltering/block-after-add-data.html contentfiltering/allow-after-finished-adding-data.html contentfiltering/block-after-add-data-then-deny-unblock.html contentfiltering/block-after-add-data-then-allow-unblock.html contentfiltering/block-after-response.html contentfiltering/block-after-response-then-allow-unblock.html contentfiltering/block-after-will-send-request.html contentfiltering/block-after-finished-adding-data.html contentfiltering/block-after-will-send-request-then-deny-unblock.html contentfiltering/block-after-finished-adding-data-then-allow-unblock.html contentfiltering/allow-after-response.html
Created attachment 282947 [details] Archive of layout-test-results from ews104 for mac-yosemite-wk2 The attached test failures were seen while running run-webkit-tests on the mac-wk2-ews. Bot: ews104 Port: mac-yosemite-wk2 Platform: Mac OS X 10.10.5
Comment on attachment 282937 [details] Patch Attachment 282937 [details] did not pass mac-debug-ews (mac): Output: http://webkit-queues.webkit.org/results/1637380 New failing tests: contentfiltering/allow-after-will-send-request.html contentfiltering/allow-never.html contentfiltering/allow-after-add-data.html contentfiltering/allow-after-finished-adding-data.html contentfiltering/block-never.html contentfiltering/allow-after-response.html
Created attachment 282948 [details] Archive of layout-test-results from ews116 for mac-yosemite The attached test failures were seen while running run-webkit-tests on the mac-debug-ews. Bot: ews116 Port: mac-yosemite Platform: Mac OS X 10.10.5
The test failures are due to https://bugs.webkit.org/show_bug.cgi?id=159480, which is blocking this bug.
Created attachment 282971 [details] Patch
Attachment 282971 [details] did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm:274: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 55 files If any of these errors are false positives, please file a bug against check-webkit-style.
Created attachment 282979 [details] Patch
Attachment 282979 [details] did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm:274: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 55 files If any of these errors are false positives, please file a bug against check-webkit-style.
Comment on attachment 282979 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=282979&action=review Glancing through it. Seems reasonable. Needs more thorough review, though. > Source/WebCore/loader/ContentFilter.cpp:263 > +bool ContentFilter::continueAfterSubstituteDataRequest(DocumentLoader* activeLoader, const SubstituteData& substituteData) activeLoader could be a DocumentLoader&
Comment on attachment 282979 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=282979&action=review The code here looks fine, but I spotted what I think is a showstopper. > Source/WebCore/Resources/ContentFilterBlockedPage.html:3 > +<!DOCTYPE html> > +<meta charset=utf-8> > +<title>Blocked by Content Filter</title> This concerns me. It's the first framework resource that has user visible text in it (The title is user visible for most users) What is our localization strategy.
We discussed in person - The file is a placeholder. It should just have an html comment that says "this file intentionally left blank"
Comment on attachment 282979 [details] Patch R+ with that change
Created attachment 283074 [details] Patch
(In reply to comment #17) > Comment on attachment 282979 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=282979&action=review > > > Source/WebCore/loader/ContentFilter.cpp:263 > > +bool ContentFilter::continueAfterSubstituteDataRequest(DocumentLoader* activeLoader, const SubstituteData& substituteData) > > activeLoader could be a DocumentLoader& Good call! I made it a const DocumentLoader&.
Comment on attachment 283074 [details] Patch Clearing flags on attachment: 283074 Committed r202944: <http://trac.webkit.org/changeset/202944>
All reviewed patches have been landed. Closing bug.
Re-opened since this is blocked by bug 159570
Created attachment 283189 [details] Patch
Attachment 283189 [details] did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm:274: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 55 files If any of these errors are false positives, please file a bug against check-webkit-style.
Created attachment 283190 [details] Differences between attachment 283189 [details] and r202944
Comment on attachment 283189 [details] Patch Clearing flags on attachment: 283189 Committed r203003: <http://trac.webkit.org/changeset/203003>