[webkit-changes] [WebKit/WebKit] ead1bd: WebExtensionControllerProxy ASSERT in WebProcess w...

[Timothy Hatcher]

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

  Changed paths:
    M Source/WebKit/UIProcess/Extensions/WebExtensionContext.cpp
    M Source/WebKit/UIProcess/Extensions/WebExtensionController.cpp
    M Source/WebKit/WebProcess/Extensions/Cocoa/WebExtensionContextProxyCocoa.mm
    M Source/WebKit/WebProcess/Extensions/WebExtensionControllerProxy.cpp

  Log Message:
  -----------
  WebExtensionControllerProxy ASSERT in WebProcess when loading a page.
https://webkit.org/b/268511
rdar://problem/122051926

Reviewed by Jeff Miller.

The check for HashMap `contains()` ASSERTs return `true`, even though the WeakPtr is
null. Check if the pointer is null instead of just contained in the map.

Change the `WeakPtr` to be `WeakRef`, to better signal that the map should be
only non-null references. Also be explicit about the smart pointers.

* Source/WebKit/UIProcess/Extensions/WebExtensionContext.cpp:
(WebKit::webExtensionContexts):
(WebKit::WebExtensionContext::get):
(WebKit::WebExtensionContext::WebExtensionContext):
* Source/WebKit/UIProcess/Extensions/WebExtensionController.cpp:
(WebKit::webExtensionControllers):
(WebKit::WebExtensionController::get):
(WebKit::WebExtensionController::WebExtensionController):
* Source/WebKit/WebProcess/Extensions/Cocoa/WebExtensionContextProxyCocoa.mm:
(WebKit::webExtensionContextProxies):
(WebKit::WebExtensionContextProxy::get):
(WebKit::WebExtensionContextProxy::WebExtensionContextProxy):
(WebKit::WebExtensionContextProxy::~WebExtensionContextProxy):
(WebKit::WebExtensionContextProxy::getOrCreate):
* Source/WebKit/WebProcess/Extensions/WebExtensionControllerProxy.cpp:
(WebKit::webExtensionControllerProxies):
(WebKit::WebExtensionControllerProxy::get):
(WebKit::WebExtensionControllerProxy::getOrCreate):
(WebKit::WebExtensionControllerProxy::WebExtensionControllerProxy):
(WebKit::WebExtensionControllerProxy::~WebExtensionControllerProxy):

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