<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[186804] branches/safari-600.1.4.17-branch/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/186804">186804</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-07-14 09:16:03 -0700 (Tue, 14 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/185877">r185877</a>. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001417branchSourceWebKit2ChangeLog">branches/safari-600.1.4.17-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001417branchSourceWebKit2SharedCocoaAPIObjectmm">branches/safari-600.1.4.17-branch/Source/WebKit2/Shared/Cocoa/APIObject.mm</a></li>
<li><a href="#branchessafari6001417branchSourceWebKit2SharedSecurityOriginDatacpp">branches/safari-600.1.4.17-branch/Source/WebKit2/Shared/SecurityOriginData.cpp</a></li>
<li><a href="#branchessafari6001417branchSourceWebKit2SharedSecurityOriginDatah">branches/safari-600.1.4.17-branch/Source/WebKit2/Shared/SecurityOriginData.h</a></li>
<li><a href="#branchessafari6001417branchSourceWebKit2UIProcessAPIAPIUIClienth">branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/API/APIUIClient.h</a></li>
<li><a href="#branchessafari6001417branchSourceWebKit2UIProcessAPICWKPagecpp">branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#branchessafari6001417branchSourceWebKit2UIProcessAPICocoaWKFrameInfomm">branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfo.mm</a></li>
<li><a href="#branchessafari6001417branchSourceWebKit2UIProcessAPICocoaWKFrameInfoInternalh">branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfoInternal.h</a></li>
<li><a href="#branchessafari6001417branchSourceWebKit2UIProcessCocoaUIDelegateh">branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h</a></li>
<li><a href="#branchessafari6001417branchSourceWebKit2UIProcessCocoaUIDelegatemm">branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm</a></li>
<li><a href="#branchessafari6001417branchSourceWebKit2UIProcessWebPageProxycpp">branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#branchessafari6001417branchSourceWebKit2UIProcessWebPageProxyh">branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#branchessafari6001417branchSourceWebKit2UIProcessWebPageProxymessagesin">branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#branchessafari6001417branchSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">branches/safari-600.1.4.17-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001417branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/ChangeLog (186803 => 186804)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,142 @@
</span><ins>+2015-07-14 Lucas Forschler <lforschler@apple.com>
+
+ Merge r185877. <rdar://problem/21709291>
+
+ 2015-06-23 Brady Eidson <beidson@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):
+
</ins><span class="cx"> 2015-07-13 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r186531. rdar://problem/21708155
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebKit2SharedCocoaAPIObjectmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/Shared/Cocoa/APIObject.mm (186803 => 186804)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> case Type::Session:
</span><span class="cx"> wrapper = [_WKWebsiteDataStore alloc];
</span><span class="cx"> break;
</span><del>-
</del><ins>+
</ins><span class="cx"> case Type::String:
</span><span class="cx"> wrapper = NSAllocateObject([WKNSString class], size, nullptr);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebKit2SharedSecurityOriginDatacpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/Shared/SecurityOriginData.cpp (186803 => 186804)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -28,13 +28,21 @@
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><ins>+#include "WebFrame.h"
</ins><span class="cx"> #include "WebSecurityOrigin.h"
</span><ins>+#include <WebCore/Document.h>
+#include <WebCore/Frame.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+SecurityOriginData SecurityOriginData::fromSecurityOrigin(const SecurityOrigin& securityOrigin)
+{
+ return fromSecurityOrigin(&securityOrigin);
+}
+
</ins><span class="cx"> SecurityOriginData SecurityOriginData::fromSecurityOrigin(const SecurityOrigin* securityOrigin)
</span><span class="cx"> {
</span><span class="cx"> SecurityOriginData securityOriginData;
</span><span class="lines">@@ -46,6 +54,30 @@
</span><span class="cx"> return securityOriginData;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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);
+}
+
</ins><span class="cx"> PassRefPtr<SecurityOrigin> SecurityOriginData::securityOrigin() const
</span><span class="cx"> {
</span><span class="cx"> return SecurityOrigin::create(protocol, host, port);
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebKit2SharedSecurityOriginDatah"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/Shared/SecurityOriginData.h (186803 => 186804)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -35,12 +35,21 @@
</span><span class="cx"> class ArgumentEncoder;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+namespace WebCore {
+class Frame;
+class SecurityOrigin;
+}
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> typedef GenericCallback<API::Array*> ArrayCallback;
</span><ins>+class WebFrame;
</ins><span class="cx">
</span><span class="cx"> struct SecurityOriginData {
</span><span class="cx"> static SecurityOriginData fromSecurityOrigin(const WebCore::SecurityOrigin*);
</span><ins>+ static SecurityOriginData fromSecurityOrigin(const WebCore::SecurityOrigin&);
+ static SecurityOriginData fromFrame(WebFrame*);
+ static SecurityOriginData fromFrame(WebCore::Frame*);
</ins><span class="cx"> PassRefPtr<WebCore::SecurityOrigin> securityOrigin() const;
</span><span class="cx">
</span><span class="cx"> void encode(IPC::ArgumentEncoder&) const;
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebKit2UIProcessAPIAPIUIClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/API/APIUIClient.h (186803 => 186804)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -57,6 +57,7 @@
</span><span class="cx"> class WebPageProxy;
</span><span class="cx"> class WebSecurityOrigin;
</span><span class="cx"> struct NavigationActionData;
</span><ins>+struct SecurityOriginData;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="lines">@@ -78,9 +79,9 @@
</span><span class="cx"> virtual void focus(WebKit::WebPageProxy*) { }
</span><span class="cx"> virtual void unfocus(WebKit::WebPageProxy*) { }
</span><span class="cx">
</span><del>- 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()); }
</del><ins>+ 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()); }
</ins><span class="cx">
</span><span class="cx"> virtual void setStatusText(WebKit::WebPageProxy*, const WTF::String&) { }
</span><span class="cx"> virtual void mouseDidMoveOverElement(WebKit::WebPageProxy*, const WebKit::WebHitTestResult::Data&, WebKit::WebEvent::Modifiers, API::Object*) { }
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/API/C/WKPage.cpp (186803 => 186804)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1252,7 +1252,7 @@
</span><span class="cx"> m_client.unfocus(toAPI(page), m_client.base.clientInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void runJavaScriptAlert(WebPageProxy* page, const String& message, WebFrameProxy* frame, std::function<void ()> completionHandler) override
</del><ins>+ virtual void runJavaScriptAlert(WebPageProxy* page, const String& message, WebFrameProxy* frame, const WebKit::SecurityOriginData& securityOriginData, std::function<void ()> completionHandler) override
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.runJavaScriptAlert) {
</span><span class="cx"> completionHandler();
</span><span class="lines">@@ -1263,7 +1263,7 @@
</span><span class="cx"> completionHandler();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void runJavaScriptConfirm(WebPageProxy* page, const String& message, WebFrameProxy* frame, std::function<void (bool)> completionHandler) override
</del><ins>+ virtual void runJavaScriptConfirm(WebPageProxy* page, const String& message, WebFrameProxy* frame, const WebKit::SecurityOriginData& securityOriginData, std::function<void (bool)> completionHandler) override
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.runJavaScriptConfirm) {
</span><span class="cx"> completionHandler(false);
</span><span class="lines">@@ -1274,7 +1274,7 @@
</span><span class="cx"> completionHandler(result);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void runJavaScriptPrompt(WebPageProxy* page, const String& message, const String& defaultValue, WebFrameProxy* frame, std::function<void (const String&)> completionHandler) override
</del><ins>+ virtual void runJavaScriptPrompt(WebPageProxy* page, const String& message, const String& defaultValue, WebFrameProxy* frame, const WebKit::SecurityOriginData& securityOriginData, std::function<void (const String&)> completionHandler) override
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.runJavaScriptPrompt) {
</span><span class="cx"> completionHandler(String());
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebKit2UIProcessAPICocoaWKFrameInfomm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfo.mm (186803 => 186804)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -29,14 +29,21 @@
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> #import "WebFrameProxy.h"
</span><ins>+#import "_WKSecurityOrigin.h"
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> @implementation WKFrameInfo {
</span><span class="cx"> RetainPtr<NSURLRequest> _request;
</span><ins>+ RetainPtr<_WKSecurityOrigin> _securityOrigin;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (instancetype)initWithWebFrameProxy:(WebKit::WebFrameProxy&)webFrameProxy
</span><span class="cx"> {
</span><ins>+ return [self initWithWebFrameProxy:webFrameProxy securityOrigin:nil];
+}
+
+- (instancetype)initWithWebFrameProxy:(WebKit::WebFrameProxy&)webFrameProxy securityOrigin:(_WKSecurityOrigin *)securityOrigin
+{
</ins><span class="cx"> if (!(self = [super init]))
</span><span class="cx"> return nil;
</span><span class="cx">
</span><span class="lines">@@ -45,6 +52,8 @@
</span><span class="cx"> // FIXME: This should use the full request of the frame, not just the URL.
</span><span class="cx"> _request = [NSURLRequest requestWithURL:[NSURL URLWithString:webFrameProxy.url()]];
</span><span class="cx">
</span><ins>+ _securityOrigin = securityOrigin;
+
</ins><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -58,6 +67,11 @@
</span><span class="cx"> return _request.get();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (_WKSecurityOrigin *)securityOrigin
+{
+ return _securityOrigin.get();
+}
+
</ins><span class="cx"> - (id)copyWithZone:(NSZone *)zone
</span><span class="cx"> {
</span><span class="cx"> return [self retain];
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebKit2UIProcessAPICocoaWKFrameInfoInternalh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfoInternal.h (186803 => 186804)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -31,9 +31,12 @@
</span><span class="cx"> class WebFrameProxy;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+@class _WKSecurityOrigin;
+
</ins><span class="cx"> @interface WKFrameInfo ()
</span><span class="cx">
</span><span class="cx"> - (instancetype)initWithWebFrameProxy:(WebKit::WebFrameProxy&)webFrameProxy;
</span><ins>+- (instancetype)initWithWebFrameProxy:(WebKit::WebFrameProxy&)webFrameProxy securityOrigin:(_WKSecurityOrigin *)securityOrigin;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebKit2UIProcessCocoaUIDelegateh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h (186803 => 186804)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -62,9 +62,9 @@
</span><span class="cx"> virtual void close(WebKit::WebPageProxy*) override;
</span><span class="cx"> virtual void didEnterFullscreen(WebKit::WebPageProxy*) override;
</span><span class="cx"> virtual void didExitFullscreen(WebKit::WebPageProxy*) override;
</span><del>- 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;
</del><ins>+ 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;
</ins><span class="cx"> 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;
</span><span class="cx"> virtual void reachedApplicationCacheOriginQuota(WebPageProxy*, const WebCore::SecurityOrigin&, uint64_t currentQuota, uint64_t totalBytesNeeded, std::function<void (unsigned long long)> completionHandler) override;
</span><span class="cx"> virtual void printFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*) override;
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebKit2UIProcessCocoaUIDelegatemm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm (186803 => 186804)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -30,8 +30,10 @@
</span><span class="cx">
</span><span class="cx"> #import "CompletionHandlerCallChecker.h"
</span><span class="cx"> #import "NavigationActionData.h"
</span><ins>+#import "SecurityOriginData.h"
</ins><span class="cx"> #import "WKFrameInfoInternal.h"
</span><span class="cx"> #import "WKNavigationActionInternal.h"
</span><ins>+#import "WKRetainPtr.h"
</ins><span class="cx"> #import "WKWebViewConfigurationInternal.h"
</span><span class="cx"> #import "WKWebViewInternal.h"
</span><span class="cx"> #import "WKWindowFeaturesInternal.h"
</span><span class="lines">@@ -117,7 +119,7 @@
</span><span class="cx"> return webView->_page.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UIDelegate::UIClient::runJavaScriptAlert(WebKit::WebPageProxy*, const WTF::String& message, WebKit::WebFrameProxy* webFrameProxy, std::function<void ()> completionHandler)
</del><ins>+void UIDelegate::UIClient::runJavaScriptAlert(WebKit::WebPageProxy*, const WTF::String& message, WebKit::WebFrameProxy* webFrameProxy, const WebKit::SecurityOriginData& securityOriginData, std::function<void ()> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_uiDelegate.m_delegateMethods.webViewRunJavaScriptAlertPanelWithMessageInitiatedByFrameCompletionHandler) {
</span><span class="cx"> completionHandler();
</span><span class="lines">@@ -131,13 +133,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<CompletionHandlerCallChecker> checker = CompletionHandlerCallChecker::create(delegate.get(), @selector(webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:completionHandler:));
</span><del>- [delegate webView:m_uiDelegate.m_webView runJavaScriptAlertPanelWithMessage:message initiatedByFrame:adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:*webFrameProxy]).get() completionHandler:[completionHandler, checker] {
</del><ins>+
+ 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] {
</ins><span class="cx"> completionHandler();
</span><span class="cx"> checker->didCallCompletionHandler();
</span><span class="cx"> }];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UIDelegate::UIClient::runJavaScriptConfirm(WebKit::WebPageProxy*, const WTF::String& message, WebKit::WebFrameProxy* webFrameProxy, std::function<void (bool)> completionHandler)
</del><ins>+void UIDelegate::UIClient::runJavaScriptConfirm(WebKit::WebPageProxy*, const WTF::String& message, WebKit::WebFrameProxy* webFrameProxy, const WebKit::SecurityOriginData& securityOriginData, std::function<void (bool)> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_uiDelegate.m_delegateMethods.webViewRunJavaScriptConfirmPanelWithMessageInitiatedByFrameCompletionHandler) {
</span><span class="cx"> completionHandler(false);
</span><span class="lines">@@ -151,13 +157,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<CompletionHandlerCallChecker> checker = CompletionHandlerCallChecker::create(delegate.get(), @selector(webView:runJavaScriptConfirmPanelWithMessage:initiatedByFrame:completionHandler:));
</span><del>- [delegate webView:m_uiDelegate.m_webView runJavaScriptConfirmPanelWithMessage:message initiatedByFrame:adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:*webFrameProxy]).get() completionHandler:[completionHandler, checker](BOOL result) {
</del><ins>+
+ 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) {
</ins><span class="cx"> completionHandler(result);
</span><span class="cx"> checker->didCallCompletionHandler();
</span><span class="cx"> }];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UIDelegate::UIClient::runJavaScriptPrompt(WebKit::WebPageProxy*, const WTF::String& message, const WTF::String& defaultValue, WebKit::WebFrameProxy* webFrameProxy, std::function<void (const WTF::String&)> completionHandler)
</del><ins>+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)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_uiDelegate.m_delegateMethods.webViewRunJavaScriptTextInputPanelWithPromptDefaultTextInitiatedByFrameCompletionHandler) {
</span><span class="cx"> completionHandler(String());
</span><span class="lines">@@ -171,7 +181,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<CompletionHandlerCallChecker> checker = CompletionHandlerCallChecker::create(delegate.get(), @selector(webView:runJavaScriptTextInputPanelWithPrompt:defaultText:initiatedByFrame:completionHandler:));
</span><del>- [delegate webView:m_uiDelegate.m_webView runJavaScriptTextInputPanelWithPrompt:message defaultText:defaultValue initiatedByFrame:adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:*webFrameProxy]).get() completionHandler:[completionHandler, checker](NSString *result) {
</del><ins>+
+ 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) {
</ins><span class="cx"> completionHandler(result);
</span><span class="cx"> checker->didCallCompletionHandler();
</span><span class="cx"> }];
</span><span class="lines">@@ -191,7 +205,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<CompletionHandlerCallChecker> checker = CompletionHandlerCallChecker::create(delegate.get(), @selector(_webView:decideDatabaseQuotaForSecurityOrigin:currentQuota:currentOriginUsage:currentDatabaseUsage:expectedUsage:decisionHandler:));
</span><del>- [(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) {
</del><ins>+ 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) {
</ins><span class="cx"> checker->didCallCompletionHandler();
</span><span class="cx"> completionHandler(newQuota);
</span><span class="cx"> }];
</span><span class="lines">@@ -211,7 +227,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<CompletionHandlerCallChecker> checker = CompletionHandlerCallChecker::create(delegate.get(), @selector(_webView:decideWebApplicationCacheQuotaForSecurityOrigin:currentQuota:totalBytesNeeded:decisionHandler:));
</span><del>- [(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) {
</del><ins>+ 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) {
</ins><span class="cx"> checker->didCallCompletionHandler();
</span><span class="cx"> completionHandler(newQuota);
</span><span class="cx"> }];
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (186803 => 186804)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -3062,7 +3062,7 @@
</span><span class="cx"> m_uiClient->close(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::runJavaScriptAlert(uint64_t frameID, const String& message, RefPtr<Messages::WebPageProxy::RunJavaScriptAlert::DelayedReply> reply)
</del><ins>+void WebPageProxy::runJavaScriptAlert(uint64_t frameID, const SecurityOriginData& securityOrigin, const String& message, RefPtr<Messages::WebPageProxy::RunJavaScriptAlert::DelayedReply> reply)
</ins><span class="cx"> {
</span><span class="cx"> WebFrameProxy* frame = m_process->webFrame(frameID);
</span><span class="cx"> MESSAGE_CHECK(frame);
</span><span class="lines">@@ -3070,10 +3070,10 @@
</span><span class="cx"> // Since runJavaScriptAlert() can spin a nested run loop we need to turn off the responsiveness timer.
</span><span class="cx"> m_process->responsivenessTimer()->stop();
</span><span class="cx">
</span><del>- m_uiClient->runJavaScriptAlert(this, message, frame, [reply]{ reply->send(); });
</del><ins>+ m_uiClient->runJavaScriptAlert(this, message, frame, securityOrigin, [reply]{ reply->send(); });
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::runJavaScriptConfirm(uint64_t frameID, const String& message, RefPtr<Messages::WebPageProxy::RunJavaScriptConfirm::DelayedReply> reply)
</del><ins>+void WebPageProxy::runJavaScriptConfirm(uint64_t frameID, const SecurityOriginData& securityOrigin, const String& message, RefPtr<Messages::WebPageProxy::RunJavaScriptConfirm::DelayedReply> reply)
</ins><span class="cx"> {
</span><span class="cx"> WebFrameProxy* frame = m_process->webFrame(frameID);
</span><span class="cx"> MESSAGE_CHECK(frame);
</span><span class="lines">@@ -3081,10 +3081,10 @@
</span><span class="cx"> // Since runJavaScriptConfirm() can spin a nested run loop we need to turn off the responsiveness timer.
</span><span class="cx"> m_process->responsivenessTimer()->stop();
</span><span class="cx">
</span><del>- m_uiClient->runJavaScriptConfirm(this, message, frame, [reply](bool result) { reply->send(result); });
</del><ins>+ m_uiClient->runJavaScriptConfirm(this, message, frame, securityOrigin, [reply](bool result) { reply->send(result); });
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::runJavaScriptPrompt(uint64_t frameID, const String& message, const String& defaultValue, RefPtr<Messages::WebPageProxy::RunJavaScriptPrompt::DelayedReply> reply)
</del><ins>+void WebPageProxy::runJavaScriptPrompt(uint64_t frameID, const SecurityOriginData& securityOrigin, const String& message, const String& defaultValue, RefPtr<Messages::WebPageProxy::RunJavaScriptPrompt::DelayedReply> reply)
</ins><span class="cx"> {
</span><span class="cx"> WebFrameProxy* frame = m_process->webFrame(frameID);
</span><span class="cx"> MESSAGE_CHECK(frame);
</span><span class="lines">@@ -3092,7 +3092,7 @@
</span><span class="cx"> // Since runJavaScriptPrompt() can spin a nested run loop we need to turn off the responsiveness timer.
</span><span class="cx"> m_process->responsivenessTimer()->stop();
</span><span class="cx">
</span><del>- m_uiClient->runJavaScriptPrompt(this, message, defaultValue, frame, [reply](const String& result) { reply->send(result); });
</del><ins>+ m_uiClient->runJavaScriptPrompt(this, message, defaultValue, frame, securityOrigin, [reply](const String& result) { reply->send(result); });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::shouldInterruptJavaScript(bool& result)
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/WebPageProxy.h (186803 => 186804)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -994,9 +994,9 @@
</span><span class="cx"> void createNewPage(uint64_t frameID, const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, const NavigationActionData&, uint64_t& newPageID, WebPageCreationParameters&);
</span><span class="cx"> void showPage();
</span><span class="cx"> void closePage(bool stopResponsivenessTimer);
</span><del>- 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>);
</del><ins>+ 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>);
</ins><span class="cx"> void shouldInterruptJavaScript(bool& result);
</span><span class="cx"> void setStatusText(const String&);
</span><span class="cx"> void mouseDidMoveOverElement(const WebHitTestResult::Data& hitTestResultData, uint32_t modifiers, IPC::MessageDecoder&);
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in (186803 => 186804)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -25,9 +25,9 @@
</span><span class="cx"> CreateNewPage(uint64_t frameID, WebCore::ResourceRequest request, WebCore::WindowFeatures windowFeatures, WebKit::NavigationActionData navigationActionData) -> (uint64_t newPageID, WebKit::WebPageCreationParameters newPageParameters)
</span><span class="cx"> ShowPage()
</span><span class="cx"> ClosePage(bool stopResponsivenessTimer)
</span><del>- 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
</del><ins>+ 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
</ins><span class="cx"> ShouldInterruptJavaScript() -> (bool shouldInterupt)
</span><span class="cx"> MouseDidMoveOverElement(WebKit::WebHitTestResult::Data hitTestResultData, uint32_t modifiers, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (186803 => 186804)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -33,6 +33,8 @@
</span><span class="cx"> #include "LayerTreeHost.h"
</span><span class="cx"> #include "NavigationActionData.h"
</span><span class="cx"> #include "PageBanner.h"
</span><ins>+#include "SecurityOriginData.h"
+#include "UserData.h"
</ins><span class="cx"> #include "WebColorChooser.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx"> #include "WebFrame.h"
</span><span class="lines">@@ -369,7 +371,7 @@
</span><span class="cx"> unsigned syncSendFlags = IPC::InformPlatformProcessWillSuspend;
</span><span class="cx"> if (WebPage::synchronousMessagesShouldSpinRunLoop())
</span><span class="cx"> syncSendFlags |= IPC::SpinRunLoopWhileWaitingForReply;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptAlert(webFrame->frameID(), alertText), Messages::WebPageProxy::RunJavaScriptAlert::Reply(), m_page->pageID(), std::chrono::milliseconds::max(), syncSendFlags);
</del><ins>+ 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);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebChromeClient::runJavaScriptConfirm(Frame* frame, const String& message)
</span><span class="lines">@@ -384,7 +386,7 @@
</span><span class="cx"> if (WebPage::synchronousMessagesShouldSpinRunLoop())
</span><span class="cx"> syncSendFlags |= IPC::SpinRunLoopWhileWaitingForReply;
</span><span class="cx"> bool result = false;
</span><del>- if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptConfirm(webFrame->frameID(), message), Messages::WebPageProxy::RunJavaScriptConfirm::Reply(result), m_page->pageID(), std::chrono::milliseconds::max(), syncSendFlags))
</del><ins>+ 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))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return result;
</span><span class="lines">@@ -402,7 +404,7 @@
</span><span class="cx"> if (WebPage::synchronousMessagesShouldSpinRunLoop())
</span><span class="cx"> syncSendFlags |= IPC::SpinRunLoopWhileWaitingForReply;
</span><span class="cx">
</span><del>- 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))
</del><ins>+ 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))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return !result.isNull();
</span></span></pre>
</div>
</div>
</body>
</html>