[webkit-changes] [WebKit/WebKit] f27c53: Clean up contentScriptWorld and userContentControl...

[Timothy Hatcher]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: f27c5302e2aab73864ddcdfe3d0878ea8767aa06
      https://github.com/WebKit/WebKit/commit/f27c5302e2aab73864ddcdfe3d0878ea8767aa06
  Author: Timothy Hatcher <timothy at apple.com>
  Date:   2024-01-31 (Wed, 31 Jan 2024)

  Changed paths:
    M Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionContextCocoa.mm
    M Source/WebKit/UIProcess/Extensions/WebExtensionContext.cpp
    M Source/WebKit/UIProcess/Extensions/WebExtensionContext.h
    M Source/WebKit/WebProcess/Extensions/WebExtensionContextProxy.h

  Log Message:
  -----------
  Clean up contentScriptWorld and userContentControllers Web Extension code.
https://webkit.org/b/268484
rdar://problem/122029362

Reviewed by Brian Weinstein and Jeff Miller.

Add a helper for getting the current content controllers for a context, to avoid
the current hasAccessInPrivateBrowsing() check in multiple places.

Also add some ASSERTs to ensure contentScriptWorld() is only used when it is known.

* Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionContextCocoa.mm:
(WebKit::WebExtensionContext::setHasAccessInPrivateBrowsing):
(WebKit::WebExtensionContext::addInjectedContent):
(WebKit::WebExtensionContext::removeInjectedContent):
(WebKit::WebExtensionContext::removeDeclarativeNetRequestRules):
(WebKit::WebExtensionContext::compileDeclarativeNetRequestRules):
* Source/WebKit/UIProcess/Extensions/WebExtensionContext.cpp:
(WebKit::WebExtensionContext::userContentControllers const): Added.
* Source/WebKit/UIProcess/Extensions/WebExtensionContext.h:
* Source/WebKit/WebProcess/Extensions/API/Cocoa/WebExtensionAPIRuntimeCocoa.mm:
(WebKit::WebExtensionContextProxy::dispatchRuntimeMessageEvent):
(WebKit::WebExtensionContextProxy::dispatchRuntimeConnectEvent):
* Source/WebKit/WebProcess/Extensions/WebExtensionContextProxy.h:

Canonical link: https://commits.webkit.org/273845@main