<!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>[170303] trunk/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/170303">170303</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-06-23 11:25:12 -0700 (Mon, 23 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] No way to grant storage quotas for WebSQL
https://bugs.webkit.org/show_bug.cgi?id=134175
Reviewed by Anders Carlsson.
* Shared/WebSecurityOrigin.h:
(WebKit::WebSecurityOrigin::securityOrigin): Changed to return a non-const reference.
* UIProcess/API/APIUIClient.h:
(API::UIClient::exceededDatabaseQuota): Added a completion handler parameter than takes the
new quota, and changed the return type to void.
* UIProcess/API/C/WKPage.cpp:
(WKPageSetPageUIClient): Changed the override of exceededDatabaseQuota to call the
completion handler with the new quota, or with the existing quota if the client doesn’t
implement the callback.
* UIProcess/API/Cocoa/WKUIDelegatePrivate.h: Declared new delegate method.
* UIProcess/API/Cocoa/_WKSecurityOrigin.h: Added.
* UIProcess/API/Cocoa/_WKSecurityOrigin.mm: Added.
(-[_WKSecurityOrigin _initWithSecurityOrigin:WebCore::]): Store the origin in an ivar.
(-[_WKSecurityOrigin protocol]): Added this accessor.
(-[_WKSecurityOrigin host]): Ditto.
(-[_WKSecurityOrigin port]): Ditto.
* UIProcess/API/Cocoa/_WKSecurityOriginInternal.h: Added.
* UIProcess/Cocoa/UIDelegate.h: Override API::UIClient::exceededDatabaseQuota. Added flag
to m_delegateMethods struct for new delegate method.
* UIProcess/Cocoa/UIDelegate.mm:
(WebKit::UIDelegate::setDelegate): Set new flag in m_delegateMethods struct.
(WebKit::UIDelegate::UIClient::exceededDatabaseQuota): Added. Calls the new delegate method.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::exceededDatabaseQuota): Updated for the new client interface: now
passing a completion handler that replies with the new quota.
* WebKit2.xcodeproj/project.pbxproj: Added references to new files, sorted a group.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebSecurityOriginh">trunk/Source/WebKit2/Shared/WebSecurityOrigin.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIUIClienth">trunk/Source/WebKit2/UIProcess/API/APIUIClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKUIDelegatePrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaUIDelegateh">trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaUIDelegatemm">trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKSecurityOriginh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSecurityOrigin.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKSecurityOriginmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSecurityOrigin.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKSecurityOriginInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSecurityOriginInternal.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170302 => 170303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-23 18:16:39 UTC (rev 170302)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-23 18:25:12 UTC (rev 170303)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2014-06-23 Dan Bernstein <mitz@apple.com>
+
+ [Cocoa] No way to grant storage quotas for WebSQL
+ https://bugs.webkit.org/show_bug.cgi?id=134175
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/WebSecurityOrigin.h:
+ (WebKit::WebSecurityOrigin::securityOrigin): Changed to return a non-const reference.
+
+ * UIProcess/API/APIUIClient.h:
+ (API::UIClient::exceededDatabaseQuota): Added a completion handler parameter than takes the
+ new quota, and changed the return type to void.
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageUIClient): Changed the override of exceededDatabaseQuota to call the
+ completion handler with the new quota, or with the existing quota if the client doesn’t
+ implement the callback.
+
+ * UIProcess/API/Cocoa/WKUIDelegatePrivate.h: Declared new delegate method.
+
+ * UIProcess/API/Cocoa/_WKSecurityOrigin.h: Added.
+ * UIProcess/API/Cocoa/_WKSecurityOrigin.mm: Added.
+ (-[_WKSecurityOrigin _initWithSecurityOrigin:WebCore::]): Store the origin in an ivar.
+ (-[_WKSecurityOrigin protocol]): Added this accessor.
+ (-[_WKSecurityOrigin host]): Ditto.
+ (-[_WKSecurityOrigin port]): Ditto.
+ * UIProcess/API/Cocoa/_WKSecurityOriginInternal.h: Added.
+
+ * UIProcess/Cocoa/UIDelegate.h: Override API::UIClient::exceededDatabaseQuota. Added flag
+ to m_delegateMethods struct for new delegate method.
+ * UIProcess/Cocoa/UIDelegate.mm:
+ (WebKit::UIDelegate::setDelegate): Set new flag in m_delegateMethods struct.
+ (WebKit::UIDelegate::UIClient::exceededDatabaseQuota): Added. Calls the new delegate method.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::exceededDatabaseQuota): Updated for the new client interface: now
+ passing a completion handler that replies with the new quota.
+
+ * WebKit2.xcodeproj/project.pbxproj: Added references to new files, sorted a group.
+
</ins><span class="cx"> 2014-06-23 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> More build fixing after r170295.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebSecurityOriginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebSecurityOrigin.h (170302 => 170303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebSecurityOrigin.h 2014-06-23 18:16:39 UTC (rev 170302)
+++ trunk/Source/WebKit2/Shared/WebSecurityOrigin.h 2014-06-23 18:25:12 UTC (rev 170303)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> return adoptRef(new WebSecurityOrigin(securityOrigin));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const WebCore::SecurityOrigin& securityOrigin() const { return *m_securityOrigin; }
</del><ins>+ WebCore::SecurityOrigin& securityOrigin() const { return *m_securityOrigin; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WebSecurityOrigin(PassRefPtr<WebCore::SecurityOrigin> securityOrigin)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIUIClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIUIClient.h (170302 => 170303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIUIClient.h 2014-06-23 18:16:39 UTC (rev 170302)
+++ trunk/Source/WebKit2/UIProcess/API/APIUIClient.h 2014-06-23 18:25:12 UTC (rev 170303)
</span><span class="lines">@@ -110,9 +110,9 @@
</span><span class="cx"> virtual void didDraw(WebKit::WebPageProxy*) { }
</span><span class="cx"> virtual void pageDidScroll(WebKit::WebPageProxy*) { }
</span><span class="cx">
</span><del>- virtual unsigned long long exceededDatabaseQuota(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::WebSecurityOrigin*, const WTF::String&, const WTF::String&, unsigned long long currentQuota, unsigned long long, unsigned long long, unsigned long long)
</del><ins>+ virtual void exceededDatabaseQuota(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::WebSecurityOrigin*, const WTF::String&, const WTF::String&, unsigned long long currentQuota, unsigned long long, unsigned long long, unsigned long long, std::function<void (unsigned long long)> completionHandler)
</ins><span class="cx"> {
</span><del>- return currentQuota;
</del><ins>+ completionHandler(currentQuota);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual bool runOpenPanel(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::WebOpenPanelParameters*, WebKit::WebOpenPanelResultListenerProxy*) { return false; }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (170302 => 170303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-06-23 18:16:39 UTC (rev 170302)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-06-23 18:25:12 UTC (rev 170303)
</span><span class="lines">@@ -1438,12 +1438,12 @@
</span><span class="cx"> m_client.pageDidScroll(toAPI(page), m_client.base.clientInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual unsigned long long exceededDatabaseQuota(WebPageProxy* page, WebFrameProxy* frame, WebSecurityOrigin* origin, const String& databaseName, const String& databaseDisplayName, unsigned long long currentQuota, unsigned long long currentOriginUsage, unsigned long long currentDatabaseUsage, unsigned long long expectedUsage) override
</del><ins>+ virtual void exceededDatabaseQuota(WebPageProxy* page, WebFrameProxy* frame, WebSecurityOrigin* origin, const String& databaseName, const String& databaseDisplayName, unsigned long long currentQuota, unsigned long long currentOriginUsage, unsigned long long currentDatabaseUsage, unsigned long long expectedUsage, std::function<void (unsigned long long)> completionHandler) override
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.exceededDatabaseQuota)
</span><del>- return currentQuota;
</del><ins>+ completionHandler(currentQuota);
</ins><span class="cx">
</span><del>- return m_client.exceededDatabaseQuota(toAPI(page), toAPI(frame), toAPI(origin), toAPI(databaseName.impl()), toAPI(databaseDisplayName.impl()), currentQuota, currentOriginUsage, currentDatabaseUsage, expectedUsage, m_client.base.clientInfo);
</del><ins>+ completionHandler(m_client.exceededDatabaseQuota(toAPI(page), toAPI(frame), toAPI(origin), toAPI(databaseName.impl()), toAPI(databaseDisplayName.impl()), currentQuota, currentOriginUsage, currentDatabaseUsage, expectedUsage, m_client.base.clientInfo));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual bool runOpenPanel(WebPageProxy* page, WebFrameProxy* frame, WebOpenPanelParameters* parameters, WebOpenPanelResultListenerProxy* listener) override
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKUIDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h (170302 => 170303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h 2014-06-23 18:16:39 UTC (rev 170302)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h 2014-06-23 18:25:12 UTC (rev 170303)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> #import <WebKit/_WKActivatedElementInfo.h>
</span><ins>+#import <WebKit/_WKSecurityOrigin.h>
</ins><span class="cx">
</span><span class="cx"> @class _WKFrameHandle;
</span><span class="cx">
</span><span class="lines">@@ -35,6 +36,9 @@
</span><span class="cx">
</span><span class="cx"> @optional
</span><span class="cx">
</span><ins>+// FIXME: This should be handled by the WKWebsiteDataStore delegate.
+- (void)_webView:(WKWebView *)webView decideDatabaseQuotaForSecurityOrigin:(_WKSecurityOrigin *)securityOrigin currentQuota:(unsigned long long)currentQuota currentOriginUsage:(unsigned long long)currentOriginUsage currentDatabaseUsage:(unsigned long long)currentUsage expectedUsage:(unsigned long long)expectedUsage decisionHandler:(void (^)(unsigned long long newQuota))decisionHandler;
+
</ins><span class="cx"> - (void)_webView:(WKWebView *)webView printFrame:(_WKFrameHandle *)frame;
</span><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKSecurityOriginh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSecurityOrigin.h (0 => 170303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSecurityOrigin.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSecurityOrigin.h 2014-06-23 18:25:12 UTC (rev 170303)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <WebKit/WKFoundation.h>
+
+#if WK_API_ENABLED
+
+#import <Foundation/Foundation.h>
+
+WK_CLASS_AVAILABLE(10_10, 8_0)
+@interface _WKSecurityOrigin : NSObject
+
+@property (nonatomic, readonly, copy) NSString *protocol;
+@property (nonatomic, readonly, copy) NSString *host;
+@property (nonatomic, readonly) unsigned short port;
+
+@end
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKSecurityOriginmm"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSecurityOrigin.mm (0 => 170303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSecurityOrigin.mm (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSecurityOrigin.mm 2014-06-23 18:25:12 UTC (rev 170303)
</span><span class="lines">@@ -0,0 +1,69 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "_WKSecurityOriginInternal.h"
+
+#if WK_API_ENABLED
+
+#import <WebCore/SecurityOrigin.h>
+#import <wtf/RefPtr.h>
+
+@implementation _WKSecurityOrigin {
+ RefPtr<WebCore::SecurityOrigin> _origin;
+}
+
+- (instancetype)_initWithSecurityOrigin:(PassRefPtr<WebCore::SecurityOrigin>)origin
+{
+ if (!(self = [super init]))
+ return nil;
+
+ if (!origin) {
+ [self release];
+ return nil;
+ }
+
+ _origin = origin->isolatedCopy();
+ return self;
+}
+
+- (NSString *)protocol
+{
+ return _origin->protocol();
+}
+
+- (NSString *)host
+{
+ return _origin->host();
+}
+
+- (unsigned short)port
+{
+ return _origin->port();
+}
+
+@end
+
+#endif // WK_API_ENABLED
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKSecurityOriginInternalh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSecurityOriginInternal.h (0 => 170303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSecurityOriginInternal.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSecurityOriginInternal.h 2014-06-23 18:25:12 UTC (rev 170303)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "_WKSecurityOrigin.h"
+
+#if WK_API_ENABLED
+
+#import <wtf/PassRefPtr.h>
+
+namespace WebCore {
+class SecurityOrigin;
+}
+
+@interface _WKSecurityOrigin ()
+
+- (instancetype)_initWithSecurityOrigin:(PassRefPtr<WebCore::SecurityOrigin>)origin;
+
+@end
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaUIDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h (170302 => 170303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h 2014-06-23 18:16:39 UTC (rev 170302)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h 2014-06-23 18:25:12 UTC (rev 170303)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> virtual void runJavaScriptAlert(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, std::function<void ()> completionHandler) override;
</span><span class="cx"> virtual void runJavaScriptConfirm(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, std::function<void (bool)> completionHandler) override;
</span><span class="cx"> virtual void runJavaScriptPrompt(WebKit::WebPageProxy*, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy*, std::function<void (const WTF::String&)> completionHandler) override;
</span><ins>+ 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;
</ins><span class="cx"> virtual void printFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*) override;
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> virtual RetainPtr<NSArray> actionsForElement(_WKActivatedElementInfo *, RetainPtr<NSArray> defaultActions) override;
</span><span class="lines">@@ -80,6 +81,7 @@
</span><span class="cx"> bool webViewRunJavaScriptAlertPanelWithMessageInitiatedByFrameCompletionHandler : 1;
</span><span class="cx"> bool webViewRunJavaScriptConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1;
</span><span class="cx"> bool webViewRunJavaScriptTextInputPanelWithPromptDefaultTextInitiatedByFrameCompletionHandler : 1;
</span><ins>+ bool webViewDecideDatabaseQuotaForSecurityOriginCurrentQuotaCurrentOriginUsageCurrentDatabaseUsageExpectedUsageDecisionHandler : 1;
</ins><span class="cx"> bool webViewPrintFrame : 1;
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> bool webViewActionsForElementDefaultActions : 1;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaUIDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm (170302 => 170303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm 2014-06-23 18:16:39 UTC (rev 170302)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm 2014-06-23 18:25:12 UTC (rev 170303)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #import "WKWindowFeaturesInternal.h"
</span><span class="cx"> #import "WKUIDelegatePrivate.h"
</span><span class="cx"> #import "_WKFrameHandleInternal.h"
</span><ins>+#import "_WKSecurityOriginInternal.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -67,6 +68,7 @@
</span><span class="cx"> m_delegateMethods.webViewRunJavaScriptAlertPanelWithMessageInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:completionHandler:)];
</span><span class="cx"> m_delegateMethods.webViewRunJavaScriptConfirmPanelWithMessageInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(webView:runJavaScriptConfirmPanelWithMessage:initiatedByFrame:completionHandler:)];
</span><span class="cx"> m_delegateMethods.webViewRunJavaScriptTextInputPanelWithPromptDefaultTextInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(webView:runJavaScriptTextInputPanelWithPrompt:defaultText:initiatedByFrame:completionHandler:)];
</span><ins>+ m_delegateMethods.webViewDecideDatabaseQuotaForSecurityOriginCurrentQuotaCurrentOriginUsageCurrentDatabaseUsageExpectedUsageDecisionHandler = [delegate respondsToSelector:@selector(_webView:decideDatabaseQuotaForSecurityOrigin:currentQuota:currentOriginUsage:currentDatabaseUsage:expectedUsage:decisionHandler:)];
</ins><span class="cx"> m_delegateMethods.webViewPrintFrame = [delegate respondsToSelector:@selector(_webView:printFrame:)];
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> m_delegateMethods.webViewActionsForElementDefaultActions = [delegate respondsToSelector:@selector(_webView:actionsForElement:defaultActions:)];
</span><span class="lines">@@ -171,6 +173,26 @@
</span><span class="cx"> }];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void UIDelegate::UIClient::exceededDatabaseQuota(WebPageProxy*, WebFrameProxy*, WebSecurityOrigin* securityOrigin, 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)> completionHandler)
+{
+ if (!m_uiDelegate.m_delegateMethods.webViewDecideDatabaseQuotaForSecurityOriginCurrentQuotaCurrentOriginUsageCurrentDatabaseUsageExpectedUsageDecisionHandler) {
+ completionHandler(currentQuota);
+ return;
+ }
+
+ auto delegate = m_uiDelegate.m_delegate.get();
+ if (!delegate) {
+ completionHandler(currentQuota);
+ return;
+ }
+
+ 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) {
+ checker->didCallCompletionHandler();
+ completionHandler(newQuota);
+ }];
+}
+
</ins><span class="cx"> void UIDelegate::UIClient::printFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy* webFrameProxy)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_ARG(webFrameProxy, webFrameProxy);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (170302 => 170303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-06-23 18:16:39 UTC (rev 170302)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-06-23 18:25:12 UTC (rev 170303)
</span><span class="lines">@@ -4444,12 +4444,12 @@
</span><span class="cx"> MESSAGE_CHECK(frame);
</span><span class="cx">
</span><span class="cx"> RefPtr<WebSecurityOrigin> origin = WebSecurityOrigin::create(SecurityOrigin::createFromDatabaseIdentifier(record->originIdentifier));
</span><del>-
- uint64_t newQuota = m_uiClient->exceededDatabaseQuota(this, frame, origin.get(),
</del><ins>+ auto currentReply = record->reply;
+ m_uiClient->exceededDatabaseQuota(this, frame, origin.get(),
</ins><span class="cx"> record->databaseName, record->displayName, record->currentQuota,
</span><del>- record->currentOriginUsage, record->currentDatabaseUsage, record->expectedUsage);
</del><ins>+ record->currentOriginUsage, record->currentDatabaseUsage, record->expectedUsage,
+ [currentReply](unsigned long long newQuota) { currentReply->send(newQuota); });
</ins><span class="cx">
</span><del>- record->reply->send(newQuota);
</del><span class="cx"> record = records.next();
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (170302 => 170303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-06-23 18:16:39 UTC (rev 170302)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-06-23 18:25:12 UTC (rev 170303)
</span><span class="lines">@@ -710,6 +710,9 @@
</span><span class="cx"> 3769079A18F31CB2001DFF04 /* APIInjectedBundlePageUIClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 3769079818F31CB2001DFF04 /* APIInjectedBundlePageUIClient.h */; };
</span><span class="cx"> 3769079E18F340A2001DFF04 /* APIInjectedBundleFormClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 3769079C18F340A2001DFF04 /* APIInjectedBundleFormClient.h */; };
</span><span class="cx"> 37694525184FC6B600CDE21F /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCF5068412431861005955AE /* Security.framework */; };
</span><ins>+ 376C51191957452E0007B0FA /* _WKSecurityOrigin.mm in Sources */ = {isa = PBXBuildFile; fileRef = 376C51171957452E0007B0FA /* _WKSecurityOrigin.mm */; };
+ 376C511A1957452E0007B0FA /* _WKSecurityOrigin.h in Headers */ = {isa = PBXBuildFile; fileRef = 376C51181957452E0007B0FA /* _WKSecurityOrigin.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 376C511D19574F5F0007B0FA /* _WKSecurityOriginInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 376C511B195748C20007B0FA /* _WKSecurityOriginInternal.h */; };
</ins><span class="cx"> 377EAD4517E2C51A002D193D /* WKDeclarationSpecifiers.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4417E2C51A002D193D /* WKDeclarationSpecifiers.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 377EAD4817E2C77B002D193D /* WKUserContentInjectedFrames.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4617E2C77B002D193D /* WKUserContentInjectedFrames.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 377EAD4917E2C77B002D193D /* WKUserScriptInjectionTime.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4717E2C77B002D193D /* WKUserScriptInjectionTime.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -2703,6 +2706,9 @@
</span><span class="cx"> 37608821150414F700FC82C7 /* WKRenderObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKRenderObject.h; sourceTree = "<group>"; };
</span><span class="cx"> 3769079818F31CB2001DFF04 /* APIInjectedBundlePageUIClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = APIInjectedBundlePageUIClient.h; path = API/APIInjectedBundlePageUIClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 3769079C18F340A2001DFF04 /* APIInjectedBundleFormClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIInjectedBundleFormClient.h; sourceTree = "<group>"; };
</span><ins>+ 376C51171957452E0007B0FA /* _WKSecurityOrigin.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKSecurityOrigin.mm; sourceTree = "<group>"; };
+ 376C51181957452E0007B0FA /* _WKSecurityOrigin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKSecurityOrigin.h; sourceTree = "<group>"; };
+ 376C511B195748C20007B0FA /* _WKSecurityOriginInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKSecurityOriginInternal.h; sourceTree = "<group>"; };
</ins><span class="cx"> 377EAD4417E2C51A002D193D /* WKDeclarationSpecifiers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDeclarationSpecifiers.h; sourceTree = "<group>"; };
</span><span class="cx"> 377EAD4617E2C77B002D193D /* WKUserContentInjectedFrames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUserContentInjectedFrames.h; sourceTree = "<group>"; };
</span><span class="cx"> 377EAD4717E2C77B002D193D /* WKUserScriptInjectionTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUserScriptInjectionTime.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4971,6 +4977,9 @@
</span><span class="cx"> 37A64E5618F38F4600EB30F1 /* _WKFormInputSession.h */,
</span><span class="cx"> 1A43E828188F3CDC009E4D30 /* _WKProcessPoolConfiguration.h */,
</span><span class="cx"> 1A43E827188F3CDC009E4D30 /* _WKProcessPoolConfiguration.mm */,
</span><ins>+ 376C51181957452E0007B0FA /* _WKSecurityOrigin.h */,
+ 376C51171957452E0007B0FA /* _WKSecurityOrigin.mm */,
+ 376C511B195748C20007B0FA /* _WKSecurityOriginInternal.h */,
</ins><span class="cx"> 2D6B371918A967AD0042AE80 /* _WKThumbnailView.h */,
</span><span class="cx"> 2D6B371A18A967AD0042AE80 /* _WKThumbnailView.mm */,
</span><span class="cx"> 2DACE64D18ADBFF000E4CA76 /* _WKThumbnailViewInternal.h */,
</span><span class="lines">@@ -4988,8 +4997,8 @@
</span><span class="cx"> 37C4C08418149C5B003688B9 /* WKBackForwardListItem.mm */,
</span><span class="cx"> 37C4C08818149F23003688B9 /* WKBackForwardListItemInternal.h */,
</span><span class="cx"> 1AF4592D19464B2000F9D4A2 /* WKError.h */,
</span><ins>+ 1AF4592C19464B2000F9D4A2 /* WKError.mm */,
</ins><span class="cx"> 1A2D252A194688FD004537B0 /* WKErrorInternal.h */,
</span><del>- 1AF4592C19464B2000F9D4A2 /* WKError.mm */,
</del><span class="cx"> 1A4D664A18A3030E00D82E21 /* WKFrameInfo.h */,
</span><span class="cx"> 1A4D664918A3030E00D82E21 /* WKFrameInfo.mm */,
</span><span class="cx"> 1A4D664D18A3031B00D82E21 /* WKFrameInfoInternal.h */,
</span><span class="lines">@@ -7042,6 +7051,7 @@
</span><span class="cx"> 1A43E82A188F3CDC009E4D30 /* _WKProcessPoolConfiguration.h in Headers */,
</span><span class="cx"> 1F7506B31859164500EC0FF7 /* WKWebProcessPlugInNodeHandle.h in Headers */,
</span><span class="cx"> 377EAD4517E2C51A002D193D /* WKDeclarationSpecifiers.h in Headers */,
</span><ins>+ 376C511D19574F5F0007B0FA /* _WKSecurityOriginInternal.h in Headers */,
</ins><span class="cx"> 1FB00AC7185F76460019142E /* WKWebProcessPlugInPageGroup.h in Headers */,
</span><span class="cx"> 377EAD4917E2C77B002D193D /* WKUserScriptInjectionTime.h in Headers */,
</span><span class="cx"> 263172CF18B469490065B9C3 /* NativeWebTouchEvent.h in Headers */,
</span><span class="lines">@@ -7072,6 +7082,7 @@
</span><span class="cx"> BC8699B5116AADAA002A925B /* WKView.h in Headers */,
</span><span class="cx"> BC8F2F2B16273A2C005FACB5 /* WKWebProcessPlugInBrowserContextController.h in Headers */,
</span><span class="cx"> 1AD8790A18B6C38A006CAFD7 /* WKUIDelegate.h in Headers */,
</span><ins>+ 376C511A1957452E0007B0FA /* _WKSecurityOrigin.h in Headers */,
</ins><span class="cx"> 290F4272172A0C7400939FF0 /* ChildProcessSupplement.h in Headers */,
</span><span class="cx"> 1A6F9F9011E13EFC00DB1371 /* CommandLine.h in Headers */,
</span><span class="cx"> 37C4E9F6131C6E7E0029BD5A /* config.h in Headers */,
</span><span class="lines">@@ -8987,6 +8998,7 @@
</span><span class="cx"> 1AB31A9616BC688100F6DBC9 /* StorageManagerMessageReceiver.cpp in Sources */,
</span><span class="cx"> 1A44B95716B737AA00B7BBD8 /* StorageNamespaceImpl.cpp in Sources */,
</span><span class="cx"> 1AFF49001833DE78009AB15A /* WKDeprecatedFunctions.cpp in Sources */,
</span><ins>+ 376C51191957452E0007B0FA /* _WKSecurityOrigin.mm in Sources */,
</ins><span class="cx"> 517DD5BE180DA7D30081660B /* DatabaseProcessProxy.cpp in Sources */,
</span><span class="cx"> 51654EFD184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.cpp in Sources */,
</span><span class="cx"> 296BD85E15019BC30071F424 /* StringUtilities.mm in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>