Changeset 162719 in webkit

Timestamp:

Jan 24, 2014 1:25:23 PM (10 years ago)

Author:

andersca@apple.com

Message:

Use a side table to map WebPageProxy objects to WKBrowsingContextController objects
​https://bugs.webkit.org/show_bug.cgi?id=127577

Reviewed by Tim Horton.

• UIProcess/API/Cocoa/WKBrowsingContextController.mm:

(browsingContextControllerMap):
(-[WKBrowsingContextController dealloc]):
(-[WKBrowsingContextController _initWithPageRef:]):
(+[WKBrowsingContextController _browsingContextControllerForPageRef:]):

• UIProcess/API/Cocoa/WKBrowsingContextControllerInternal.h:
• UIProcess/WebPageProxy.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKBrowsingContextController.mm (modified) (5 diffs)
• UIProcess/API/Cocoa/WKBrowsingContextControllerInternal.h (modified) (1 diff)
• UIProcess/WebPageProxy.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-01-24  Anders Carlsson  <andersca@apple.com>
+
+        Use a side table to map WebPageProxy objects to WKBrowsingContextController objects
+        https://bugs.webkit.org/show_bug.cgi?id=127577
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+        (browsingContextControllerMap):
+        (-[WKBrowsingContextController dealloc]):
+        (-[WKBrowsingContextController _initWithPageRef:]):
+        (+[WKBrowsingContextController _browsingContextControllerForPageRef:]):
+        * UIProcess/API/Cocoa/WKBrowsingContextControllerInternal.h:
+        * UIProcess/WebPageProxy.h:
+
 2014-01-24  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm

@@ -59 +59 @@
 #import "WebContext.h"
 #import "WebPageProxy.h"
+#import <wtf/NeverDestroyed.h>
 
 using namespace WebCore;
@@ -150 +151 @@
 }
 
+static HashMap<WebPageProxy*, WKBrowsingContextController *>& browsingContextControllerMap()
+{
+    static NeverDestroyed<HashMap<WebPageProxy*, WKBrowsingContextController *>> browsingContextControllerMap;
+    return browsingContextControllerMap;
+}
+
 - (void)dealloc
 {
+    ASSERT(browsingContextControllerMap().get(_page.get()) == self);
+    browsingContextControllerMap().remove(_page.get());
+
     _page->pageLoadState().removeObserver(*_pageLoadStateObserver);
-    _page->~WebPageProxy();
 
     [_remoteObjectRegistry _invalidate];
@@ -786 +795 @@
 }
 
-#pragma mark WKObject protocol implementation
-
-- (API::Object&)_apiObject
-{
-    return *reinterpret_cast<API::Object*>(&_page);
-}
 
 - (instancetype)_initWithPageRef:(WKPageRef)pageRef
@@ -803 +806 @@
     _page->pageLoadState().addObserver(*_pageLoadStateObserver);
 
+    ASSERT(!browsingContextControllerMap().contains(_page.get()));
+    browsingContextControllerMap().set(_page.get(), self);
+
     return self;
 }
@@ -808 +814 @@
 + (WKBrowsingContextController *)_browsingContextControllerForPageRef:(WKPageRef)pageRef
 {
-    return (WKBrowsingContextController *)static_cast<const WebLoaderClient*>(WebKit::toImpl(pageRef)->loaderClient())->client().base.clientInfo;
+    return browsingContextControllerMap().get(toImpl(pageRef));
 }
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextControllerInternal.h

@@ -28 +28 @@
 #if WK_API_ENABLED
 
-#import "WKObject.h"
 #import "WeakObjCPtr.h"
 #import "WebPageProxy.h"
 
-@interface WKBrowsingContextController () <WKObject> {
+@interface WKBrowsingContextController () {
 @package
     WebKit::WeakObjCPtr<id <WKBrowsingContextHistoryDelegate>> _historyDelegate;

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -835 +835 @@
 #endif
 
-    const API::LoaderClient* loaderClient() { return m_loaderClient.get(); }
-
     WebCore::IntSize minimumLayoutSize() const { return m_minimumLayoutSize; }
     void setMinimumLayoutSize(const WebCore::IntSize&);