Bug 184205 – Make NetworkProcess get ContentBlocker information from UIProcess

• Status: RESOLVED
• Resolution: FIXED
• Component: WebCore Misc.

[youenn fablet]

Make NetworkProcess get ContentBlocker information from UIProcess

[youenn fablet]

Created attachment 336901 [details]
Patch

[youenn fablet]

Created attachment 336987 [details]
Patch

[youenn fablet]

Created attachment 336991 [details]
Patch

[Alex Christensen]

Comment on attachment 336991 [details]
Patch

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

> Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp:112
> +void NetworkLoadChecker::continueCheckingRequest(ResourceRequest&& request, ValidationHandler&& handler)

I think this is an unnecessary continue function.  Couldn't this just be a lambda inside checkRequest?

> Source/WebKit/NetworkProcess/NetworkUserContentController.cpp:2
> + * Copyright (C) 2017 Apple Inc. All rights reserved.

2018

> Source/WebKit/NetworkProcess/NetworkUserContentController.h:2
> + * Copyright (C) 2017 Apple Inc. All rights reserved.

2018

> Source/WebKit/NetworkProcess/NetworkUserContentController.h:42
> +class NetworkUserContentController {

ContentRuleListManager?

[youenn fablet]

> > Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp:112
> > +void NetworkLoadChecker::continueCheckingRequest(ResourceRequest&& request, ValidationHandler&& handler)
> 
> I think this is an unnecessary continue function.  Couldn't this just be a
> lambda inside checkRequest?

I would agree if we were to only compile for #if ENABLE(CONTENT_EXTENSIONS).
Since we are compiling for both, we would need to compile-conditionally checkRequest call.

> > Source/WebKit/NetworkProcess/NetworkUserContentController.cpp:2
> > + * Copyright (C) 2017 Apple Inc. All rights reserved.
> 
> 2018

OK

> > Source/WebKit/NetworkProcess/NetworkUserContentController.h:2
> > + * Copyright (C) 2017 Apple Inc. All rights reserved.
> 
> 2018

OK

> > Source/WebKit/NetworkProcess/NetworkUserContentController.h:42
> > +class NetworkUserContentController {
> 
> ContentRuleListManager?

OK, will change it to NetworkContentRuleListManager.

[youenn fablet]

Created attachment 337024 [details]
Patch

[Alex Christensen]

Comment on attachment 337024 [details]
Patch

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

> Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp:557
> +        webUserContentControllerProxy->addNetworkProcess(*this);

Will it work correctly if someone adds a content rule list after a WKWebView is already instantiated and doing loading?

> Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp:461
> +    WebPage* webPage = webFrame ? webFrame->page() : nullptr;

We should probably check webPage for null before using it.  And let's put its declaration inside the scope of where it's used.

[Alex Christensen]

Comment on attachment 337024 [details]
Patch

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

> Source/WebKit/UIProcess/UserContent/WebUserContentControllerProxy.cpp:358
> +        process->send(Messages::NetworkContentRuleListManager::AddContentRuleLists { identifier(), { pair } }, 0);

Ah, here.  This will update it.

[youenn fablet]

Created attachment 337035 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 337035 [details]
Patch

Rejecting attachment 337035 [details] from commit-queue.

Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-03', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 337035, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit

Last 500 characters of output:
org/git/WebKit
   0ba6dafd0b0..ef8bb830f8b  master     -> origin/master
Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ...
Currently at 230192 = 0ba6dafd0b0f84b3fd563178f8009853ff2a4de1
r230193 = ef8bb830f8be80faa63866c7d213f3f8d6521938
Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc
First, rewinding head to replay your work on top of it...
Fast-forwarded master to refs/remotes/origin/master.

Full output: http://webkit-queues.webkit.org/results/7185921

[WebKit Commit Bot]

Comment on attachment 337035 [details]
Patch

Rejecting attachment 337035 [details] from commit-queue.

Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'apply-attachment', '--no-update', '--non-interactive', 337035, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit

Last 500 characters of output:
 hunks FAILED -- saving rejects to file Source/WebKit/WebKit.xcodeproj/project.pbxproj.rej
patching file Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
patching file Source/WebKit/WebProcess/UserContent/WebUserContentController.cpp
patching file Source/WebKit/WebProcess/UserContent/WebUserContentController.h
patching file Source/WebKit/WebProcess/WebPage/WebPage.h

Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

Full output: http://webkit-queues.webkit.org/results/7193568

[youenn fablet]

Created attachment 337084 [details]
Rebasing

[WebKit Commit Bot]

Comment on attachment 337084 [details]
Rebasing

Clearing flags on attachment: 337084

Committed r230210: <https://trac.webkit.org/changeset/230210>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Radar WebKit Bug Importer]

<rdar://problem/39146551>

[WebKit Commit Bot]

Re-opened since this is blocked by bug 184277

[Ryan Haddad]

(In reply to WebKit Commit Bot from comment #16)
> Re-opened since this is blocked by bug 184277
Link to test run showing crashes and wpt test failures after this change:
https://build.webkit.org/results/Apple%20Sierra%20Release%20WK2%20(Tests)/r230211%20(8539)/results.html

API test assertion failures:
ASSERTION FAILED: isValidIdentifier(m_identifier)
https://build.webkit.org/builders/Apple%20Sierra%20Debug%20WK1%20%28Tests%29/builds/7020

[youenn fablet]

Created attachment 337111 [details]
Build and crash fix

[youenn fablet]

Created attachment 337113 [details]
Build and crash fix

[WebKit Commit Bot]

Comment on attachment 337113 [details]
Build and crash fix

Clearing flags on attachment: 337113

Committed r230223: <https://trac.webkit.org/changeset/230223>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Ryan Haddad]

(In reply to WebKit Commit Bot from comment #20)
> Comment on attachment 337113 [details]
> Build and crash fix
> 
> Clearing flags on attachment: 337113
> 
> Committed r230223: <https://trac.webkit.org/changeset/230223>
API tests are still hitting an assertion failure:
https://build.webkit.org/builders/Apple%20High%20Sierra%20Debug%20WK2%20(Tests)/builds/2711

[youenn fablet]

Will fix it tonight

[youenn fablet]

Reopening to attach new patch.

[youenn fablet]

Created attachment 337137 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 337137 [details]
Patch

Clearing flags on attachment: 337137

Committed r230232: <https://trac.webkit.org/changeset/230232>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.