Bug 194872 – Regression(PSON) "Reload without content extensions" does not work when the main resource is blocked

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit2

[Chris Dumez]

"Reload without content extensions" does not work when the main resource is blocked, it keeps blocking the load when PSON is enabled.

[Chris Dumez]

<rdar://problem/47924500>

[Chris Dumez]

Created attachment 362541 [details]
Patch

[EWS Watchlist]

Attachment 362541 [details] did not pass style-queue:


ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:4916:  Multi-line string ("...") found.  This lint script doesn't do well with such strings, and may give bogus warnings.  They're ugly and unnecessary, and you should use concatenation instead".  [readability/multiline_string] [5]
ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:4920:  Multi-line string ("...") found.  This lint script doesn't do well with such strings, and may give bogus warnings.  They're ugly and unnecessary, and you should use concatenation instead".  [readability/multiline_string] [5]
Total errors found: 2 in 5 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Alex Christensen]

Comment on attachment 362541 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=362541&action=review

> Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:4875
> +    [[WKContentRuleListStore defaultStore] removeContentRuleListForIdentifier:@"ContentBlockingAfterProcessSwapExtension" completionHandler:^(NSError *error) {

Can we do this at the end of the test to prevent the state from leaking into other tests?

[Chris Dumez]

Created attachment 362546 [details]
Patch

[EWS Watchlist]

Attachment 362546 [details] did not pass style-queue:


ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:4916:  Multi-line string ("...") found.  This lint script doesn't do well with such strings, and may give bogus warnings.  They're ugly and unnecessary, and you should use concatenation instead".  [readability/multiline_string] [5]
ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:4920:  Multi-line string ("...") found.  This lint script doesn't do well with such strings, and may give bogus warnings.  They're ugly and unnecessary, and you should use concatenation instead".  [readability/multiline_string] [5]
Total errors found: 2 in 5 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[WebKit Commit Bot]

Comment on attachment 362546 [details]
Patch

Clearing flags on attachment: 362546

Committed r241845: <https://trac.webkit.org/changeset/241845>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.