Changeset 64155 in webkit

Timestamp:

Jul 27, 2010 2:06:35 PM (14 years ago)

Author:

Adam Roben

Message:

Fix PageClient ownership in WebPageProxy

WKView now owns the PageClient, similar to how things work on Windows
(where the WebView is the PageClient).

Fixes <​http://webkit.org/b/40185> WebPageProxy should keep a weak
reference to the PageClient

Reviewed by Anders Carlsson.

• UIProcess/API/mac/WKView.mm:

(-[WKView initWithFrame:pageNamespaceRef:]): Store the PageClientImpl
on our WKViewData object and pass it to the WebPageProxy.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::setPageClient):

• UIProcess/WebPageProxy.h:

Removed Mac-specific code that put the PageClient in an OwnPtr. We now
store it in a bare pointer just like on Windows.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/mac/WKView.mm (modified) (2 diffs)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)
• UIProcess/WebPageProxy.h (modified) (1 diff)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-07-27  Adam Roben  <aroben@apple.com>
+
+        Fix PageClient ownership in WebPageProxy
+
+        WKView now owns the PageClient, similar to how things work on Windows
+        (where the WebView is the PageClient).
+
+        Fixes <http://webkit.org/b/40185> WebPageProxy should keep a weak
+        reference to the PageClient
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView initWithFrame:pageNamespaceRef:]): Store the PageClientImpl
+        on our WKViewData object and pass it to the WebPageProxy.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::setPageClient):
+        * UIProcess/WebPageProxy.h:
+        Removed Mac-specific code that put the PageClient in an OwnPtr. We now
+        store it in a bare pointer just like on Windows.
+
 2010-07-27  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit2/UIProcess/API/mac/WKView.mm

@@ -50 +50 @@
 @interface WKViewData : NSObject {
 @public
+    OwnPtr<PageClientImpl> _pageClient;
     RefPtr<WebPageProxy> _page;
 
@@ -85 +86 @@
     _data = [[WKViewData alloc] init];
 
+    _data->_pageClient.set(new PageClientImpl(self));
     _data->_page = toWK(pageNamespaceRef)->createWebPage();
-    _data->_page->setPageClient(new PageClientImpl(self));
+    _data->_page->setPageClient(_data->_pageClient.get());
     _data->_page->initializeWebPage(IntSize(frame.size), new ChunkedUpdateDrawingAreaProxy(self));
     _data->_page->setIsInWindow([self window]);

trunk/WebKit2/UIProcess/WebPageProxy.cpp

@@ -98 +98 @@
 void WebPageProxy::setPageClient(PageClient* pageClient)
 {
-#if PLATFORM(WIN)
     m_pageClient = pageClient;
-#else
-    m_pageClient.set(pageClient);
-#endif
 }
 

trunk/WebKit2/UIProcess/WebPageProxy.h

@@ -211 +211 @@
 #endif    
 
-#if PLATFORM(WIN)
     PageClient* m_pageClient;
-#else
-    // FIXME: This should not be an OwnPtr to the PageClient.  We need to find a better way to clean up m_pageClient on mac.
-    // http://bugs.webkit.org/show_bug.cgi?id=40185
-    OwnPtr<PageClient> m_pageClient;
-#endif
     WebLoaderClient m_loaderClient;
     WebPolicyClient m_policyClient;