Bug 237217

Summary: Fix test failures when enabling content filtering in the Network process
Product: WebKit Reporter: Per Arne Vollan <pvollan>
Component: WebKit Misc.Assignee: Per Arne Vollan <pvollan>
Status: RESOLVED FIXED    
Severity: Normal CC: benjamin, bfulgham, cdumez, changseok, cmarcelo, esprehn+autocc, ews-watchlist, ggaren, gyuyoung.kim, japhet, mazander, webkit-bug-importer
Priority: P2 Keywords: InRadar
Version: WebKit Nightly Build   
Hardware: Unspecified   
OS: Unspecified   
Attachments:
Description Flags
Patch
none
Patch
none
Patch
ews-feeder: commit-queue-
Patch
none
Patch
ews-feeder: commit-queue-
Patch
ews-feeder: commit-queue-
Patch
ews-feeder: commit-queue-
Patch
none
Patch
ews-feeder: commit-queue-
Patch
ews-feeder: commit-queue-
Patch
ews-feeder: commit-queue-
Patch
ews-feeder: commit-queue-
Patch
ews-feeder: commit-queue-
Patch
ews-feeder: commit-queue-
Patch
ews-feeder: commit-queue-
Patch
ews-feeder: commit-queue-
Patch
ews-feeder: commit-queue-
Patch
none
Patch
none
Patch
none
Patch
ews-feeder: commit-queue-
Patch
ews-feeder: commit-queue-
Patch
none
Patch
none
Patch
none
Patch
none
Patch
none
Patch
ews-feeder: commit-queue-
Patch
none
Patch
ews-feeder: commit-queue-
Patch
bfulgham: review+, ews-feeder: commit-queue-
Patch
ews-feeder: commit-queue-
Patch none

Description Per Arne Vollan 2022-02-25 10:51:13 PST 
Some tests are currently failing when enabling content filtering in the Network process.
Comment 1 Per Arne Vollan 2022-02-25 11:29:46 PST 
Created attachment 453237 [details]
Patch
Comment 2 Per Arne Vollan 2022-03-01 08:02:08 PST 
Created attachment 453499 [details]
Patch
Comment 3 Per Arne Vollan 2022-03-01 12:36:16 PST 
Created attachment 453523 [details]
Patch
Comment 4 Per Arne Vollan 2022-03-01 13:41:22 PST 
Created attachment 453538 [details]
Patch
Comment 5 Per Arne Vollan 2022-03-02 07:41:35 PST 
Created attachment 453610 [details]
Patch
Comment 6 Per Arne Vollan 2022-03-02 14:08:44 PST 
Created attachment 453658 [details]
Patch
Comment 7 Per Arne Vollan 2022-03-02 15:27:43 PST 
Created attachment 453666 [details]
Patch
Comment 8 Per Arne Vollan 2022-03-02 15:49:34 PST 
Created attachment 453670 [details]
Patch
Comment 9 Per Arne Vollan 2022-03-03 07:32:43 PST 
Created attachment 453734 [details]
Patch
Comment 10 Per Arne Vollan 2022-03-03 07:51:14 PST 
Created attachment 453735 [details]
Patch
Comment 11 Per Arne Vollan 2022-03-03 07:58:24 PST 
Created attachment 453738 [details]
Patch
Comment 12 Per Arne Vollan 2022-03-03 08:05:38 PST 
Created attachment 453742 [details]
Patch
Comment 13 Per Arne Vollan 2022-03-03 08:17:50 PST 
Created attachment 453744 [details]
Patch
Comment 14 Per Arne Vollan 2022-03-03 08:55:19 PST 
Created attachment 453747 [details]
Patch
Comment 15 Per Arne Vollan 2022-03-03 10:21:31 PST 
Created attachment 453756 [details]
Patch
Comment 16 Per Arne Vollan 2022-03-03 11:37:56 PST 
Created attachment 453768 [details]
Patch
Comment 17 Per Arne Vollan 2022-03-03 13:18:31 PST 
Created attachment 453781 [details]
Patch
Comment 18 Per Arne Vollan 2022-03-03 14:34:20 PST 
Created attachment 453787 [details]
Patch
Comment 19 Radar WebKit Bug Importer 2022-03-04 10:52:18 PST 
<rdar://problem/89823305>
Comment 20 Per Arne Vollan 2022-03-08 07:26:23 PST 
Created attachment 454120 [details]
Patch
Comment 21 Per Arne Vollan 2022-03-10 07:32:29 PST 
Created attachment 454361 [details]
Patch
Comment 22 Per Arne Vollan 2022-03-10 15:39:51 PST 
Created attachment 454411 [details]
Patch
Comment 23 Per Arne Vollan 2022-03-10 16:01:51 PST 
Created attachment 454415 [details]
Patch
Comment 24 Per Arne Vollan 2022-03-10 16:16:22 PST 
Created attachment 454421 [details]
Patch
Comment 25 Per Arne Vollan 2022-03-11 08:05:35 PST 
Created attachment 454486 [details]
Patch
Comment 26 Per Arne Vollan 2022-03-11 08:20:51 PST 
Created attachment 454487 [details]
Patch
Comment 27 Per Arne Vollan 2022-03-15 07:25:52 PDT 
Created attachment 454705 [details]
Patch
Comment 28 Per Arne Vollan 2022-03-15 08:53:55 PDT 
Created attachment 454712 [details]
Patch
Comment 29 Per Arne Vollan 2022-03-16 09:37:37 PDT 
Created attachment 454847 [details]
Patch
Comment 30 Per Arne Vollan 2022-03-16 10:14:41 PDT 
Created attachment 454851 [details]
Patch
Comment 31 Per Arne Vollan 2022-03-17 07:24:40 PDT 
Created attachment 454970 [details]
Patch
Comment 32 Per Arne Vollan 2022-03-17 07:34:27 PDT 
Created attachment 454972 [details]
Patch
Comment 33 Brent Fulgham 2022-03-17 10:32:54 PDT 
Comment on attachment 454972 [details]
Patch

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

r=me

> Source/WebCore/loader/DocumentLoader.cpp:144
> +    static bool filter;

Does this need a default initializer?

> Source/WebKit/WebProcess/Network/WebResourceLoader.h:105
> +    void contentFilterDidBlockLoad(const WebCore::ContentFilterUnblockHandler&, String&& unblockRequestDeniedScript, const WebCore::ResourceError&, const URL& blockedPageURL,  WebCore::SubstituteData&&);

Nit: two spaces between comma and 'WebCore::SubstituteData&&'
Comment 34 Per Arne Vollan 2022-03-17 10:46:02 PDT 
Created attachment 454992 [details]
Patch
Comment 35 Per Arne Vollan 2022-03-17 10:49:17 PDT 
(In reply to Brent Fulgham from comment #33)
> Comment on attachment 454972 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=454972&action=review
> 
> r=me
> 
> > Source/WebCore/loader/DocumentLoader.cpp:144
> > +    static bool filter;
> 
> Does this need a default initializer?
> 

Added.

> > Source/WebKit/WebProcess/Network/WebResourceLoader.h:105
> > +    void contentFilterDidBlockLoad(const WebCore::ContentFilterUnblockHandler&, String&& unblockRequestDeniedScript, const WebCore::ResourceError&, const URL& blockedPageURL,  WebCore::SubstituteData&&);
> 
> Nit: two spaces between comma and 'WebCore::SubstituteData&&'

Fixed.

Thanks for reviewing!
Comment 36 EWS 2022-03-18 09:38:47 PDT 
Tools/Scripts/svn-apply failed to apply attachment 454992 [details] to trunk.
Please resolve the conflicts and upload a new patch.
Comment 37 Per Arne Vollan 2022-03-18 10:04:35 PDT 
Created attachment 455105 [details]
Patch
Comment 38 EWS 2022-03-18 15:13:27 PDT 
Committed r291499 (248611@main): <https://commits.webkit.org/248611@main>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 455105 [details].