Title: [162675] trunk/Source/WebKit2
- Revision
- 162675
- Author
- ander...@apple.com
- Date
- 2014-01-23 18:33:02 -0800 (Thu, 23 Jan 2014)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (162674 => 162675)
--- trunk/Source/WebKit2/ChangeLog 2014-01-24 02:24:51 UTC (rev 162674)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-24 02:33:02 UTC (rev 162675)
@@ -1,5 +1,18 @@
2014-01-23 Anders Carlsson <ander...@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 <ander...@apple.com>
+
Simplify API::LoaderClient management
https://bugs.webkit.org/show_bug.cgi?id=127531
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm (162674 => 162675)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2014-01-24 02:24:51 UTC (rev 162674)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2014-01-24 02:33:02 UTC (rev 162675)
@@ -47,6 +47,7 @@
#import "WKNSURLAuthenticationChallenge.h"
#import "WKNSURLExtras.h"
#import "WKNSURLProtectionSpace.h"
+#import "WKPagePolicyClientInternal.h"
#import "WKProcessGroupPrivate.h"
#import "WKRemoteObjectRegistryInternal.h"
#import "WKRenderingProgressEventsInternal.h"
@@ -57,7 +58,6 @@
#import "WebCertificateInfo.h"
#import "WebContext.h"
#import "WebPageProxy.h"
-#import "WebPolicyClient.h"
using namespace WebCore;
using namespace WebKit;
@@ -713,7 +713,7 @@
WKFramePolicyListenerUse(listener);
};
- page.setPolicyClient(std::make_unique<WebPolicyClient>(&policyClient.base));
+ WKPageSetPagePolicyClient(toAPI(&page), &policyClient.base);
}
- (id <WKBrowsingContextLoadDelegate>)loadDelegate
@@ -743,7 +743,7 @@
if (policyDelegate)
setUpPagePolicyClient(self, *_page);
else
- _page->setPolicyClient(nullptr);
+ WKPageSetPagePolicyClient(toAPI(_page.get()), nullptr);
}
- (id <WKBrowsingContextHistoryDelegate>)historyDelegate
Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (162674 => 162675)
--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2014-01-24 02:24:51 UTC (rev 162674)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2014-01-24 02:33:02 UTC (rev 162675)
@@ -37,7 +37,6 @@
#include "WebPageCreationParameters.h"
#include "WebPageGroup.h"
#include "WebPageProxy.h"
-#include "WebPolicyClient.h"
#include "WebPreferences.h"
#include "WebProcessProxy.h"
#include <WebCore/SchemeRegistry.h>
@@ -450,7 +449,7 @@
0, /* decidePolicyForResponse */
};
- inspectorPage->setPolicyClient(std::make_unique<WebPolicyClient>(&policyClient.base));
+ WKPageSetPagePolicyClient(toAPI(inspectorPage), &policyClient.base);
String url = ""
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
