Changeset 162675 in webkit

Timestamp:

Jan 23, 2014 6:33:02 PM (10 years ago)

Author:

andersca@apple.com

Message:

Only WKPage should know about WebPolicyClient
​https://bugs.webkit.org/show_bug.cgi?id=127535

Reviewed by Andreas Kling.

• UIProcess/API/Cocoa/WKBrowsingContextController.mm:

(setUpPagePolicyClient):
(-[WKBrowsingContextController setPolicyDelegate:]):

• UIProcess/WebInspectorProxy.cpp:

(WebKit::WebInspectorProxy::createInspectorPage):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKBrowsingContextController.mm (modified) (4 diffs)
• UIProcess/WebInspectorProxy.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-01-23  Anders Carlsson  <andersca@apple.com>
+
+        Only WKPage should know about WebPolicyClient
+        https://bugs.webkit.org/show_bug.cgi?id=127535
+
+        Reviewed by Andreas Kling.
+
+        * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+        (setUpPagePolicyClient):
+        (-[WKBrowsingContextController setPolicyDelegate:]):
+        * UIProcess/WebInspectorProxy.cpp:
+        (WebKit::WebInspectorProxy::createInspectorPage):
+
 2014-01-23  Anders Carlsson  <andersca@apple.com>
 

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

@@ -48 +48 @@
 #import "WKNSURLExtras.h"
 #import "WKNSURLProtectionSpace.h"
+#import "WKPagePolicyClientInternal.h"
 #import "WKProcessGroupPrivate.h"
 #import "WKRemoteObjectRegistryInternal.h"
@@ -58 +59 @@
 #import "WebContext.h"
 #import "WebPageProxy.h"
-#import "WebPolicyClient.h"
 
 using namespace WebCore;
@@ -714 +714 @@
     };
 
-    page.setPolicyClient(std::make_unique<WebPolicyClient>(&policyClient.base));
+    WKPageSetPagePolicyClient(toAPI(&page), &policyClient.base);
 }
 
@@ -744 +744 @@
         setUpPagePolicyClient(self, *_page);
     else
-        _page->setPolicyClient(nullptr);
+        WKPageSetPagePolicyClient(toAPI(_page.get()), nullptr);
 }
 

trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp

@@ -38 +38 @@
 #include "WebPageGroup.h"
 #include "WebPageProxy.h"
-#include "WebPolicyClient.h"
 #include "WebPreferences.h"
 #include "WebProcessProxy.h"
@@ -451 +450 @@
     };
 
-    inspectorPage->setPolicyClient(std::make_unique<WebPolicyClient>(&policyClient.base));
+    WKPageSetPagePolicyClient(toAPI(inspectorPage), &policyClient.base);
 
     String url = inspectorPageURL();