Diff
Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/ChangeLog (186803 => 186804)
--- branches/safari-600.1.4.17-branch/Source/WebKit2/ChangeLog 2015-07-14 15:58:05 UTC (rev 186803)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/ChangeLog 2015-07-14 16:16:03 UTC (rev 186804)
@@ -1,3 +1,142 @@
+2015-07-14 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r185877. <rdar://problem/21709291>
+
+ 2015-06-23 Brady Eidson <beid...@apple.com>
+
+ WKFrameInfo should have an accessor for the Frame's current security origin.
+ https://bugs.webkit.org/show_bug.cgi?id=146162
+
+ Reviewed by Dan Bernstein.
+
+ This patch:
+ - Promotes _WKSecurityOrigin to API.
+ - Makes the WKSecurityOrigin Cocoa API object work with API::SecurityOrigin.
+ - Adds a WKSecurityOrigin accessor to WKFrameInfo.
+ - Changes IPC messaging so every handler that calls out with a WKFrameInfo object
+ gets a relevant SecurityOrigin to wrap.
+
+ * Shared/API/APISecurityOrigin.h:
+ (API::SecurityOrigin::create):
+ (API::SecurityOrigin::SecurityOrigin):
+
+ * Shared/API/Cocoa/WebKit.h:
+
+ * Shared/API/c/WKSharedAPICast.h:
+ (WebKit::toCopiedAPI):
+
+ * Shared/Cocoa/APIObject.mm:
+ (API::Object::newObject):
+
+ * Shared/SecurityOriginData.cpp:
+ (WebKit::SecurityOriginData::fromFrame):
+ * Shared/SecurityOriginData.h:
+
+ * UIProcess/API/APIFrameInfo.cpp:
+ (API::FrameInfo::FrameInfo):
+ * UIProcess/API/APIFrameInfo.h:
+
+ * UIProcess/API/APINavigationClient.h:
+ (API::NavigationClient::didFailProvisionalLoadInSubframeWithError):
+
+ * UIProcess/API/APIUIClient.h:
+ (API::UIClient::createNewPage):
+ (API::UIClient::runJavaScriptAlert):
+ (API::UIClient::runJavaScriptConfirm):
+ (API::UIClient::runJavaScriptPrompt):
+
+ * UIProcess/API/C/WKApplicationCacheManager.cpp:
+ (WKApplicationCacheManagerGetApplicationCacheOrigins):
+
+ * UIProcess/API/C/WKKeyValueStorageManager.cpp:
+ (WKKeyValueStorageManagerGetKeyValueStorageOrigins):
+
+ * UIProcess/API/C/WKOriginDataManager.cpp:
+ (WKOriginDataManagerGetOrigins):
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageUIClient):
+ (WKPageSetPageNavigationClient):
+
+ * UIProcess/API/C/WKResourceCacheManager.cpp:
+ (WKResourceCacheManagerGetCacheOrigins):
+
+ * UIProcess/API/Cocoa/WKFrameInfo.h:
+ * UIProcess/API/Cocoa/WKFrameInfo.mm:
+ (-[WKFrameInfo securityOrigin]):
+
+ * UIProcess/API/Cocoa/WKSecurityOrigin.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKSecurityOrigin.h.
+ * UIProcess/API/Cocoa/WKSecurityOrigin.mm: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKSecurityOrigin.mm.
+ (-[WKSecurityOrigin dealloc]):
+ (-[WKSecurityOrigin description]):
+ (-[WKSecurityOrigin protocol]):
+ (-[WKSecurityOrigin host]):
+ (-[WKSecurityOrigin port]):
+ (-[WKSecurityOrigin _apiObject]):
+ * UIProcess/API/Cocoa/WKSecurityOriginInternal.h: Renamed from Source/WebKit2/UIProcess/API/Cocoa/_WKSecurityOriginInternal.h.
+ (API::wrapper):
+
+ * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
+
+ * UIProcess/API/Cocoa/WKUserContentController.mm:
+
+ * UIProcess/API/Cocoa/_WKSecurityOrigin.h:
+ * UIProcess/API/Cocoa/_WKSecurityOrigin.mm:
+ (-[_WKSecurityOrigin _initWithSecurityOrigin:]): Deleted.
+ (-[_WKSecurityOrigin protocol]): Deleted.
+ (-[_WKSecurityOrigin host]): Deleted.
+ (-[_WKSecurityOrigin port]): Deleted.
+
+ * UIProcess/Cocoa/NavigationState.h:
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::NavigationState::NavigationClient::didFailProvisionalLoadInSubframeWithError):
+
+ * UIProcess/Cocoa/UIDelegate.h:
+ * UIProcess/Cocoa/UIDelegate.mm:
+ (WebKit::UIDelegate::UIClient::createNewPage):
+ (WebKit::UIDelegate::UIClient::runJavaScriptAlert):
+ (WebKit::UIDelegate::UIClient::runJavaScriptConfirm):
+ (WebKit::UIDelegate::UIClient::runJavaScriptPrompt):
+ (WebKit::UIDelegate::UIClient::exceededDatabaseQuota):
+ (WebKit::UIDelegate::UIClient::reachedApplicationCacheOriginQuota):
+
+ * UIProcess/UserContent/WebScriptMessageHandler.h:
+
+ * UIProcess/UserContent/WebUserContentControllerProxy.cpp:
+ (WebKit::WebUserContentControllerProxy::didPostMessage):
+ * UIProcess/UserContent/WebUserContentControllerProxy.h:
+ * UIProcess/UserContent/WebUserContentControllerProxy.messages.in:
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didFailProvisionalLoadForFrame):
+ (WebKit::WebPageProxy::decidePolicyForNavigationAction):
+ (WebKit::WebPageProxy::decidePolicyForNewWindowAction):
+ (WebKit::WebPageProxy::decidePolicyForResponse):
+ (WebKit::WebPageProxy::decidePolicyForResponseSync):
+ (WebKit::WebPageProxy::createNewPage):
+ (WebKit::WebPageProxy::runJavaScriptAlert):
+ (WebKit::WebPageProxy::runJavaScriptConfirm):
+ (WebKit::WebPageProxy::runJavaScriptPrompt):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+
+ * WebKit2.xcodeproj/project.pbxproj:
+
+ * WebProcess/UserContent/WebUserContentController.cpp:
+ (WebKit::WebUserMessageHandlerDescriptorProxy::didPostMessage):
+
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::createWindow):
+ (WebKit::WebChromeClient::runJavaScriptAlert):
+ (WebKit::WebChromeClient::runJavaScriptConfirm):
+ (WebKit::WebChromeClient::runJavaScriptPrompt):
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::dispatchDidFailProvisionalLoad):
+ (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForResponse):
+ (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction):
+ (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
+
2015-07-13 David Kilzer <ddkil...@apple.com>
Merge r186531. rdar://problem/21708155
Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/Shared/Cocoa/APIObject.mm (186803 => 186804)
--- branches/safari-600.1.4.17-branch/Source/WebKit2/Shared/Cocoa/APIObject.mm 2015-07-14 15:58:05 UTC (rev 186803)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/Shared/Cocoa/APIObject.mm 2015-07-14 16:16:03 UTC (rev 186804)
@@ -143,7 +143,7 @@
case Type::Session:
wrapper = [_WKWebsiteDataStore alloc];
break;
-
+
case Type::String:
wrapper = NSAllocateObject([WKNSString class], size, nullptr);
break;
Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/Shared/SecurityOriginData.cpp (186803 => 186804)
--- branches/safari-600.1.4.17-branch/Source/WebKit2/Shared/SecurityOriginData.cpp 2015-07-14 15:58:05 UTC (rev 186803)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/Shared/SecurityOriginData.cpp 2015-07-14 16:16:03 UTC (rev 186804)
@@ -28,13 +28,21 @@
#include "APIArray.h"
#include "WebCoreArgumentCoders.h"
+#include "WebFrame.h"
#include "WebSecurityOrigin.h"
+#include <WebCore/Document.h>
+#include <WebCore/Frame.h>
#include <wtf/text/CString.h>
using namespace WebCore;
namespace WebKit {
+SecurityOriginData SecurityOriginData::fromSecurityOrigin(const SecurityOrigin& securityOrigin)
+{
+ return fromSecurityOrigin(&securityOrigin);
+}
+
SecurityOriginData SecurityOriginData::fromSecurityOrigin(const SecurityOrigin* securityOrigin)
{
SecurityOriginData securityOriginData;
@@ -46,6 +54,30 @@
return securityOriginData;
}
+SecurityOriginData SecurityOriginData::fromFrame(WebFrame* frame)
+{
+ if (!frame)
+ return SecurityOriginData();
+
+ return SecurityOriginData::fromFrame(frame->coreFrame());
+}
+
+SecurityOriginData SecurityOriginData::fromFrame(Frame* frame)
+{
+ if (!frame)
+ return SecurityOriginData();
+
+ Document* document = frame->document();
+ if (!document)
+ return SecurityOriginData();
+
+ SecurityOrigin* origin = document->securityOrigin();
+ if (!origin)
+ return SecurityOriginData();
+
+ return SecurityOriginData::fromSecurityOrigin(*origin);
+}
+
PassRefPtr<SecurityOrigin> SecurityOriginData::securityOrigin() const
{
return SecurityOrigin::create(protocol, host, port);
Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/Shared/SecurityOriginData.h (186803 => 186804)
--- branches/safari-600.1.4.17-branch/Source/WebKit2/Shared/SecurityOriginData.h 2015-07-14 15:58:05 UTC (rev 186803)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/Shared/SecurityOriginData.h 2015-07-14 16:16:03 UTC (rev 186804)
@@ -35,12 +35,21 @@
class ArgumentEncoder;
}
+namespace WebCore {
+class Frame;
+class SecurityOrigin;
+}
+
namespace WebKit {
typedef GenericCallback<API::Array*> ArrayCallback;
+class WebFrame;
struct SecurityOriginData {
static SecurityOriginData fromSecurityOrigin(const WebCore::SecurityOrigin*);
+ static SecurityOriginData fromSecurityOrigin(const WebCore::SecurityOrigin&);
+ static SecurityOriginData fromFrame(WebFrame*);
+ static SecurityOriginData fromFrame(WebCore::Frame*);
PassRefPtr<WebCore::SecurityOrigin> securityOrigin() const;
void encode(IPC::ArgumentEncoder&) const;
Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/API/APIUIClient.h (186803 => 186804)
--- branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/API/APIUIClient.h 2015-07-14 15:58:05 UTC (rev 186803)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/API/APIUIClient.h 2015-07-14 16:16:03 UTC (rev 186804)
@@ -57,6 +57,7 @@
class WebPageProxy;
class WebSecurityOrigin;
struct NavigationActionData;
+struct SecurityOriginData;
}
namespace API {
@@ -78,9 +79,9 @@
virtual void focus(WebKit::WebPageProxy*) { }
virtual void unfocus(WebKit::WebPageProxy*) { }
- virtual void runJavaScriptAlert(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, std::function<void ()> completionHandler) { completionHandler(); }
- virtual void runJavaScriptConfirm(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, std::function<void (bool)> completionHandler) { completionHandler(false); }
- virtual void runJavaScriptPrompt(WebKit::WebPageProxy*, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy*, std::function<void (const WTF::String&)> completionHandler) { completionHandler(WTF::String()); }
+ virtual void runJavaScriptAlert(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, const WebKit::SecurityOriginData&, std::function<void ()> completionHandler) { completionHandler(); }
+ virtual void runJavaScriptConfirm(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, const WebKit::SecurityOriginData&, std::function<void (bool)> completionHandler) { completionHandler(false); }
+ virtual void runJavaScriptPrompt(WebKit::WebPageProxy*, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy*, const WebKit::SecurityOriginData&, std::function<void (const WTF::String&)> completionHandler) { completionHandler(WTF::String()); }
virtual void setStatusText(WebKit::WebPageProxy*, const WTF::String&) { }
virtual void mouseDidMoveOverElement(WebKit::WebPageProxy*, const WebKit::WebHitTestResult::Data&, WebKit::WebEvent::Modifiers, API::Object*) { }
Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/API/C/WKPage.cpp (186803 => 186804)
--- branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-07-14 15:58:05 UTC (rev 186803)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-07-14 16:16:03 UTC (rev 186804)
@@ -1252,7 +1252,7 @@
m_client.unfocus(toAPI(page), m_client.base.clientInfo);
}
- virtual void runJavaScriptAlert(WebPageProxy* page, const String& message, WebFrameProxy* frame, std::function<void ()> completionHandler) override
+ virtual void runJavaScriptAlert(WebPageProxy* page, const String& message, WebFrameProxy* frame, const WebKit::SecurityOriginData& securityOriginData, std::function<void ()> completionHandler) override
{
if (!m_client.runJavaScriptAlert) {
completionHandler();
@@ -1263,7 +1263,7 @@
completionHandler();
}
- virtual void runJavaScriptConfirm(WebPageProxy* page, const String& message, WebFrameProxy* frame, std::function<void (bool)> completionHandler) override
+ virtual void runJavaScriptConfirm(WebPageProxy* page, const String& message, WebFrameProxy* frame, const WebKit::SecurityOriginData& securityOriginData, std::function<void (bool)> completionHandler) override
{
if (!m_client.runJavaScriptConfirm) {
completionHandler(false);
@@ -1274,7 +1274,7 @@
completionHandler(result);
}
- virtual void runJavaScriptPrompt(WebPageProxy* page, const String& message, const String& defaultValue, WebFrameProxy* frame, std::function<void (const String&)> completionHandler) override
+ virtual void runJavaScriptPrompt(WebPageProxy* page, const String& message, const String& defaultValue, WebFrameProxy* frame, const WebKit::SecurityOriginData& securityOriginData, std::function<void (const String&)> completionHandler) override
{
if (!m_client.runJavaScriptPrompt) {
completionHandler(String());
Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfo.mm (186803 => 186804)
--- branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfo.mm 2015-07-14 15:58:05 UTC (rev 186803)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfo.mm 2015-07-14 16:16:03 UTC (rev 186804)
@@ -29,14 +29,21 @@
#if WK_API_ENABLED
#import "WebFrameProxy.h"
+#import "_WKSecurityOrigin.h"
#import <wtf/RetainPtr.h>
@implementation WKFrameInfo {
RetainPtr<NSURLRequest> _request;
+ RetainPtr<_WKSecurityOrigin> _securityOrigin;
}
- (instancetype)initWithWebFrameProxy:(WebKit::WebFrameProxy&)webFrameProxy
{
+ return [self initWithWebFrameProxy:webFrameProxy securityOrigin:nil];
+}
+
+- (instancetype)initWithWebFrameProxy:(WebKit::WebFrameProxy&)webFrameProxy securityOrigin:(_WKSecurityOrigin *)securityOrigin
+{
if (!(self = [super init]))
return nil;
@@ -45,6 +52,8 @@
// FIXME: This should use the full request of the frame, not just the URL.
_request = [NSURLRequest requestWithURL:[NSURL URLWithString:webFrameProxy.url()]];
+ _securityOrigin = securityOrigin;
+
return self;
}
@@ -58,6 +67,11 @@
return _request.get();
}
+- (_WKSecurityOrigin *)securityOrigin
+{
+ return _securityOrigin.get();
+}
+
- (id)copyWithZone:(NSZone *)zone
{
return [self retain];
Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfoInternal.h (186803 => 186804)
--- branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfoInternal.h 2015-07-14 15:58:05 UTC (rev 186803)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfoInternal.h 2015-07-14 16:16:03 UTC (rev 186804)
@@ -31,9 +31,12 @@
class WebFrameProxy;
}
+@class _WKSecurityOrigin;
+
@interface WKFrameInfo ()
- (instancetype)initWithWebFrameProxy:(WebKit::WebFrameProxy&)webFrameProxy;
+- (instancetype)initWithWebFrameProxy:(WebKit::WebFrameProxy&)webFrameProxy securityOrigin:(_WKSecurityOrigin *)securityOrigin;
@end
Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h (186803 => 186804)
--- branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h 2015-07-14 15:58:05 UTC (rev 186803)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h 2015-07-14 16:16:03 UTC (rev 186804)
@@ -62,9 +62,9 @@
virtual void close(WebKit::WebPageProxy*) override;
virtual void didEnterFullscreen(WebKit::WebPageProxy*) override;
virtual void didExitFullscreen(WebKit::WebPageProxy*) override;
- virtual void runJavaScriptAlert(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, std::function<void ()> completionHandler) override;
- virtual void runJavaScriptConfirm(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, std::function<void (bool)> completionHandler) override;
- virtual void runJavaScriptPrompt(WebKit::WebPageProxy*, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy*, std::function<void (const WTF::String&)> completionHandler) override;
+ virtual void runJavaScriptAlert(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, const WebKit::SecurityOriginData&, std::function<void ()> completionHandler) override;
+ virtual void runJavaScriptConfirm(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, const WebKit::SecurityOriginData&, std::function<void (bool)> completionHandler) override;
+ virtual void runJavaScriptPrompt(WebKit::WebPageProxy*, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy*, const WebKit::SecurityOriginData&, std::function<void (const WTF::String&)> completionHandler) override;
virtual void exceededDatabaseQuota(WebPageProxy*, WebFrameProxy*, WebSecurityOrigin*, const WTF::String& databaseName, const WTF::String& displayName, unsigned long long currentQuota, unsigned long long currentOriginUsage, unsigned long long currentUsage, unsigned long long expectedUsage, std::function<void (unsigned long long)>) override;
virtual void reachedApplicationCacheOriginQuota(WebPageProxy*, const WebCore::SecurityOrigin&, uint64_t currentQuota, uint64_t totalBytesNeeded, std::function<void (unsigned long long)> completionHandler) override;
virtual void printFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*) override;
Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm (186803 => 186804)
--- branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm 2015-07-14 15:58:05 UTC (rev 186803)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm 2015-07-14 16:16:03 UTC (rev 186804)
@@ -30,8 +30,10 @@
#import "CompletionHandlerCallChecker.h"
#import "NavigationActionData.h"
+#import "SecurityOriginData.h"
#import "WKFrameInfoInternal.h"
#import "WKNavigationActionInternal.h"
+#import "WKRetainPtr.h"
#import "WKWebViewConfigurationInternal.h"
#import "WKWebViewInternal.h"
#import "WKWindowFeaturesInternal.h"
@@ -117,7 +119,7 @@
return webView->_page.get();
}
-void UIDelegate::UIClient::runJavaScriptAlert(WebKit::WebPageProxy*, const WTF::String& message, WebKit::WebFrameProxy* webFrameProxy, std::function<void ()> completionHandler)
+void UIDelegate::UIClient::runJavaScriptAlert(WebKit::WebPageProxy*, const WTF::String& message, WebKit::WebFrameProxy* webFrameProxy, const WebKit::SecurityOriginData& securityOriginData, std::function<void ()> completionHandler)
{
if (!m_uiDelegate.m_delegateMethods.webViewRunJavaScriptAlertPanelWithMessageInitiatedByFrameCompletionHandler) {
completionHandler();
@@ -131,13 +133,17 @@
}
RefPtr<CompletionHandlerCallChecker> checker = CompletionHandlerCallChecker::create(delegate.get(), @selector(webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:completionHandler:));
- [delegate webView:m_uiDelegate.m_webView runJavaScriptAlertPanelWithMessage:message initiatedByFrame:adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:*webFrameProxy]).get() completionHandler:[completionHandler, checker] {
+
+ RefPtr<WebCore::SecurityOrigin> coreOrigin = securityOriginData.securityOrigin();
+ RetainPtr<_WKSecurityOrigin> wkOrigin = adoptNS([[_WKSecurityOrigin alloc] _initWithSecurityOrigin:*coreOrigin]);
+
+ [delegate webView:m_uiDelegate.m_webView runJavaScriptAlertPanelWithMessage:message initiatedByFrame:adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:*webFrameProxy securityOrigin:wkOrigin.get()]).get() completionHandler:[completionHandler, checker] {
completionHandler();
checker->didCallCompletionHandler();
}];
}
-void UIDelegate::UIClient::runJavaScriptConfirm(WebKit::WebPageProxy*, const WTF::String& message, WebKit::WebFrameProxy* webFrameProxy, std::function<void (bool)> completionHandler)
+void UIDelegate::UIClient::runJavaScriptConfirm(WebKit::WebPageProxy*, const WTF::String& message, WebKit::WebFrameProxy* webFrameProxy, const WebKit::SecurityOriginData& securityOriginData, std::function<void (bool)> completionHandler)
{
if (!m_uiDelegate.m_delegateMethods.webViewRunJavaScriptConfirmPanelWithMessageInitiatedByFrameCompletionHandler) {
completionHandler(false);
@@ -151,13 +157,17 @@
}
RefPtr<CompletionHandlerCallChecker> checker = CompletionHandlerCallChecker::create(delegate.get(), @selector(webView:runJavaScriptConfirmPanelWithMessage:initiatedByFrame:completionHandler:));
- [delegate webView:m_uiDelegate.m_webView runJavaScriptConfirmPanelWithMessage:message initiatedByFrame:adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:*webFrameProxy]).get() completionHandler:[completionHandler, checker](BOOL result) {
+
+ RefPtr<WebCore::SecurityOrigin> coreOrigin = securityOriginData.securityOrigin();
+ RetainPtr<_WKSecurityOrigin> wkOrigin = adoptNS([[_WKSecurityOrigin alloc] _initWithSecurityOrigin:*coreOrigin]);
+
+ [delegate webView:m_uiDelegate.m_webView runJavaScriptConfirmPanelWithMessage:message initiatedByFrame:adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:*webFrameProxy securityOrigin:wkOrigin.get()]).get() completionHandler:[completionHandler, checker](BOOL result) {
completionHandler(result);
checker->didCallCompletionHandler();
}];
}
-void UIDelegate::UIClient::runJavaScriptPrompt(WebKit::WebPageProxy*, const WTF::String& message, const WTF::String& defaultValue, WebKit::WebFrameProxy* webFrameProxy, std::function<void (const WTF::String&)> completionHandler)
+void UIDelegate::UIClient::runJavaScriptPrompt(WebKit::WebPageProxy*, const WTF::String& message, const WTF::String& defaultValue, WebKit::WebFrameProxy* webFrameProxy, const WebKit::SecurityOriginData& securityOriginData, std::function<void (const WTF::String&)> completionHandler)
{
if (!m_uiDelegate.m_delegateMethods.webViewRunJavaScriptTextInputPanelWithPromptDefaultTextInitiatedByFrameCompletionHandler) {
completionHandler(String());
@@ -171,7 +181,11 @@
}
RefPtr<CompletionHandlerCallChecker> checker = CompletionHandlerCallChecker::create(delegate.get(), @selector(webView:runJavaScriptTextInputPanelWithPrompt:defaultText:initiatedByFrame:completionHandler:));
- [delegate webView:m_uiDelegate.m_webView runJavaScriptTextInputPanelWithPrompt:message defaultText:defaultValue initiatedByFrame:adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:*webFrameProxy]).get() completionHandler:[completionHandler, checker](NSString *result) {
+
+ RefPtr<WebCore::SecurityOrigin> coreOrigin = securityOriginData.securityOrigin();
+ RetainPtr<_WKSecurityOrigin> wkOrigin = adoptNS([[_WKSecurityOrigin alloc] _initWithSecurityOrigin:*coreOrigin]);
+
+ [delegate webView:m_uiDelegate.m_webView runJavaScriptTextInputPanelWithPrompt:message defaultText:defaultValue initiatedByFrame:adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:*webFrameProxy securityOrigin:wkOrigin.get()]).get() completionHandler:[completionHandler, checker](NSString *result) {
completionHandler(result);
checker->didCallCompletionHandler();
}];
@@ -191,7 +205,9 @@
}
RefPtr<CompletionHandlerCallChecker> checker = CompletionHandlerCallChecker::create(delegate.get(), @selector(_webView:decideDatabaseQuotaForSecurityOrigin:currentQuota:currentOriginUsage:currentDatabaseUsage:expectedUsage:decisionHandler:));
- [(id <WKUIDelegatePrivate>)delegate _webView:m_uiDelegate.m_webView decideDatabaseQuotaForSecurityOrigin:adoptNS([[_WKSecurityOrigin alloc] _initWithSecurityOrigin:securityOrigin->securityOrigin()]).get() currentQuota:currentQuota currentOriginUsage:currentOriginUsage currentDatabaseUsage:currentUsage expectedUsage:expectedUsage decisionHandler:[completionHandler, checker](unsigned long long newQuota) {
+ RetainPtr<_WKSecurityOrigin> wkOrigin = adoptNS([[_WKSecurityOrigin alloc] _initWithSecurityOrigin:securityOrigin->securityOrigin()]);
+
+ [(id <WKUIDelegatePrivate>)delegate _webView:m_uiDelegate.m_webView decideDatabaseQuotaForSecurityOrigin:wkOrigin.get() currentQuota:currentQuota currentOriginUsage:currentOriginUsage currentDatabaseUsage:currentUsage expectedUsage:expectedUsage decisionHandler:[completionHandler, checker](unsigned long long newQuota) {
checker->didCallCompletionHandler();
completionHandler(newQuota);
}];
@@ -211,7 +227,9 @@
}
RefPtr<CompletionHandlerCallChecker> checker = CompletionHandlerCallChecker::create(delegate.get(), @selector(_webView:decideWebApplicationCacheQuotaForSecurityOrigin:currentQuota:totalBytesNeeded:decisionHandler:));
- [(id <WKUIDelegatePrivate>)delegate _webView:m_uiDelegate.m_webView decideWebApplicationCacheQuotaForSecurityOrigin:adoptNS([[_WKSecurityOrigin alloc] _initWithSecurityOrigin:securityOrigin]).get() currentQuota:currentQuota totalBytesNeeded:totalBytesNeeded decisionHandler:[completionHandler, checker](unsigned long long newQuota) {
+ RetainPtr<_WKSecurityOrigin> wkOrigin = adoptNS([[_WKSecurityOrigin alloc] _initWithSecurityOrigin:securityOrigin]);
+
+ [(id <WKUIDelegatePrivate>)delegate _webView:m_uiDelegate.m_webView decideWebApplicationCacheQuotaForSecurityOrigin:wkOrigin.get() currentQuota:currentQuota totalBytesNeeded:totalBytesNeeded decisionHandler:[completionHandler, checker](unsigned long long newQuota) {
checker->didCallCompletionHandler();
completionHandler(newQuota);
}];
Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (186803 => 186804)
--- branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-07-14 15:58:05 UTC (rev 186803)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-07-14 16:16:03 UTC (rev 186804)
@@ -3062,7 +3062,7 @@
m_uiClient->close(this);
}
-void WebPageProxy::runJavaScriptAlert(uint64_t frameID, const String& message, RefPtr<Messages::WebPageProxy::RunJavaScriptAlert::DelayedReply> reply)
+void WebPageProxy::runJavaScriptAlert(uint64_t frameID, const SecurityOriginData& securityOrigin, const String& message, RefPtr<Messages::WebPageProxy::RunJavaScriptAlert::DelayedReply> reply)
{
WebFrameProxy* frame = m_process->webFrame(frameID);
MESSAGE_CHECK(frame);
@@ -3070,10 +3070,10 @@
// Since runJavaScriptAlert() can spin a nested run loop we need to turn off the responsiveness timer.
m_process->responsivenessTimer()->stop();
- m_uiClient->runJavaScriptAlert(this, message, frame, [reply]{ reply->send(); });
+ m_uiClient->runJavaScriptAlert(this, message, frame, securityOrigin, [reply]{ reply->send(); });
}
-void WebPageProxy::runJavaScriptConfirm(uint64_t frameID, const String& message, RefPtr<Messages::WebPageProxy::RunJavaScriptConfirm::DelayedReply> reply)
+void WebPageProxy::runJavaScriptConfirm(uint64_t frameID, const SecurityOriginData& securityOrigin, const String& message, RefPtr<Messages::WebPageProxy::RunJavaScriptConfirm::DelayedReply> reply)
{
WebFrameProxy* frame = m_process->webFrame(frameID);
MESSAGE_CHECK(frame);
@@ -3081,10 +3081,10 @@
// Since runJavaScriptConfirm() can spin a nested run loop we need to turn off the responsiveness timer.
m_process->responsivenessTimer()->stop();
- m_uiClient->runJavaScriptConfirm(this, message, frame, [reply](bool result) { reply->send(result); });
+ m_uiClient->runJavaScriptConfirm(this, message, frame, securityOrigin, [reply](bool result) { reply->send(result); });
}
-void WebPageProxy::runJavaScriptPrompt(uint64_t frameID, const String& message, const String& defaultValue, RefPtr<Messages::WebPageProxy::RunJavaScriptPrompt::DelayedReply> reply)
+void WebPageProxy::runJavaScriptPrompt(uint64_t frameID, const SecurityOriginData& securityOrigin, const String& message, const String& defaultValue, RefPtr<Messages::WebPageProxy::RunJavaScriptPrompt::DelayedReply> reply)
{
WebFrameProxy* frame = m_process->webFrame(frameID);
MESSAGE_CHECK(frame);
@@ -3092,7 +3092,7 @@
// Since runJavaScriptPrompt() can spin a nested run loop we need to turn off the responsiveness timer.
m_process->responsivenessTimer()->stop();
- m_uiClient->runJavaScriptPrompt(this, message, defaultValue, frame, [reply](const String& result) { reply->send(result); });
+ m_uiClient->runJavaScriptPrompt(this, message, defaultValue, frame, securityOrigin, [reply](const String& result) { reply->send(result); });
}
void WebPageProxy::shouldInterruptJavaScript(bool& result)
Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/WebPageProxy.h (186803 => 186804)
--- branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2015-07-14 15:58:05 UTC (rev 186803)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2015-07-14 16:16:03 UTC (rev 186804)
@@ -994,9 +994,9 @@
void createNewPage(uint64_t frameID, const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, const NavigationActionData&, uint64_t& newPageID, WebPageCreationParameters&);
void showPage();
void closePage(bool stopResponsivenessTimer);
- void runJavaScriptAlert(uint64_t frameID, const String&, RefPtr<Messages::WebPageProxy::RunJavaScriptAlert::DelayedReply>);
- void runJavaScriptConfirm(uint64_t frameID, const String&, RefPtr<Messages::WebPageProxy::RunJavaScriptConfirm::DelayedReply>);
- void runJavaScriptPrompt(uint64_t frameID, const String&, const String&, RefPtr<Messages::WebPageProxy::RunJavaScriptPrompt::DelayedReply>);
+ void runJavaScriptAlert(uint64_t frameID, const SecurityOriginData&, const String&, RefPtr<Messages::WebPageProxy::RunJavaScriptAlert::DelayedReply>);
+ void runJavaScriptConfirm(uint64_t frameID, const SecurityOriginData&, const String&, RefPtr<Messages::WebPageProxy::RunJavaScriptConfirm::DelayedReply>);
+ void runJavaScriptPrompt(uint64_t frameID, const SecurityOriginData&, const String&, const String&, RefPtr<Messages::WebPageProxy::RunJavaScriptPrompt::DelayedReply>);
void shouldInterruptJavaScript(bool& result);
void setStatusText(const String&);
void mouseDidMoveOverElement(const WebHitTestResult::Data& hitTestResultData, uint32_t modifiers, IPC::MessageDecoder&);
Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in (186803 => 186804)
--- branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-07-14 15:58:05 UTC (rev 186803)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-07-14 16:16:03 UTC (rev 186804)
@@ -25,9 +25,9 @@
CreateNewPage(uint64_t frameID, WebCore::ResourceRequest request, WebCore::WindowFeatures windowFeatures, WebKit::NavigationActionData navigationActionData) -> (uint64_t newPageID, WebKit::WebPageCreationParameters newPageParameters)
ShowPage()
ClosePage(bool stopResponsivenessTimer)
- RunJavaScriptAlert(uint64_t frameID, String message) -> () Delayed
- RunJavaScriptConfirm(uint64_t frameID, String message) -> (bool result) Delayed
- RunJavaScriptPrompt(uint64_t frameID, String message, String defaultValue) -> (String result) Delayed
+ RunJavaScriptAlert(uint64_t frameID, WebKit::SecurityOriginData frameSecurityOrigin, String message) -> () Delayed
+ RunJavaScriptConfirm(uint64_t frameID, WebKit::SecurityOriginData frameSecurityOrigin, String message) -> (bool result) Delayed
+ RunJavaScriptPrompt(uint64_t frameID, WebKit::SecurityOriginData frameSecurityOrigin, String message, String defaultValue) -> (String result) Delayed
ShouldInterruptJavaScript() -> (bool shouldInterupt)
MouseDidMoveOverElement(WebKit::WebHitTestResult::Data hitTestResultData, uint32_t modifiers, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
#if ENABLE(NETSCAPE_PLUGIN_API)
Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (186803 => 186804)
--- branches/safari-600.1.4.17-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-07-14 15:58:05 UTC (rev 186803)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-07-14 16:16:03 UTC (rev 186804)
@@ -33,6 +33,8 @@
#include "LayerTreeHost.h"
#include "NavigationActionData.h"
#include "PageBanner.h"
+#include "SecurityOriginData.h"
+#include "UserData.h"
#include "WebColorChooser.h"
#include "WebCoreArgumentCoders.h"
#include "WebFrame.h"
@@ -369,7 +371,7 @@
unsigned syncSendFlags = IPC::InformPlatformProcessWillSuspend;
if (WebPage::synchronousMessagesShouldSpinRunLoop())
syncSendFlags |= IPC::SpinRunLoopWhileWaitingForReply;
- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptAlert(webFrame->frameID(), alertText), Messages::WebPageProxy::RunJavaScriptAlert::Reply(), m_page->pageID(), std::chrono::milliseconds::max(), syncSendFlags);
+ WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptAlert(webFrame->frameID(), SecurityOriginData::fromFrame(frame), alertText), Messages::WebPageProxy::RunJavaScriptAlert::Reply(), m_page->pageID(), std::chrono::milliseconds::max(), syncSendFlags);
}
bool WebChromeClient::runJavaScriptConfirm(Frame* frame, const String& message)
@@ -384,7 +386,7 @@
if (WebPage::synchronousMessagesShouldSpinRunLoop())
syncSendFlags |= IPC::SpinRunLoopWhileWaitingForReply;
bool result = false;
- if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptConfirm(webFrame->frameID(), message), Messages::WebPageProxy::RunJavaScriptConfirm::Reply(result), m_page->pageID(), std::chrono::milliseconds::max(), syncSendFlags))
+ if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptConfirm(webFrame->frameID(), SecurityOriginData::fromFrame(frame), message), Messages::WebPageProxy::RunJavaScriptConfirm::Reply(result), m_page->pageID(), std::chrono::milliseconds::max(), syncSendFlags))
return false;
return result;
@@ -402,7 +404,7 @@
if (WebPage::synchronousMessagesShouldSpinRunLoop())
syncSendFlags |= IPC::SpinRunLoopWhileWaitingForReply;
- if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptPrompt(webFrame->frameID(), message, defaultValue), Messages::WebPageProxy::RunJavaScriptPrompt::Reply(result), m_page->pageID(), std::chrono::milliseconds::max(), syncSendFlags))
+ if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptPrompt(webFrame->frameID(), SecurityOriginData::fromFrame(frame), message, defaultValue), Messages::WebPageProxy::RunJavaScriptPrompt::Reply(result), m_page->pageID(), std::chrono::milliseconds::max(), syncSendFlags))
return false;
return !result.isNull();
