<!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>[177639] 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/177639">177639</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-22 11:27:07 -0800 (Mon, 22 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename a bunch of API classes and move them to Shared/API
https://bugs.webkit.org/show_bug.cgi?id=139866
Reviewed by Sam Weinig.
* Shared/API/APISecurityOrigin.h: Renamed from Source/WebKit2/Shared/WebSecurityOrigin.h.
(API::SecurityOrigin::createFromString):
(API::SecurityOrigin::create):
(API::SecurityOrigin::securityOrigin):
(API::SecurityOrigin::SecurityOrigin):
* Shared/API/APISerializedScriptValue.h: Renamed from Source/WebKit2/Shared/WebSerializedScriptValue.h.
(API::SerializedScriptValue::create):
(API::SerializedScriptValue::adopt):
(API::SerializedScriptValue::deserialize):
(API::SerializedScriptValue::dataReference):
(API::SerializedScriptValue::internalRepresentation):
(API::SerializedScriptValue::SerializedScriptValue):
* Shared/API/APIUserContentURLPattern.h: Renamed from Source/WebKit2/Shared/WebUserContentURLPattern.h.
(API::UserContentURLPattern::create):
(API::UserContentURLPattern::host):
(API::UserContentURLPattern::scheme):
(API::UserContentURLPattern::isValid):
(API::UserContentURLPattern::matchesURL):
(API::UserContentURLPattern::matchesSubdomains):
(API::UserContentURLPattern::patternString):
(API::UserContentURLPattern::UserContentURLPattern):
* Shared/API/c/WKSecurityOrigin.cpp:
(WKSecurityOriginGetTypeID):
(WKSecurityOriginCreateFromString):
(WKSecurityOriginCreateFromDatabaseIdentifier):
(WKSecurityOriginCreate):
* Shared/API/c/WKSerializedScriptValue.cpp:
(WKSerializedScriptValueGetTypeID):
(WKSerializedScriptValueCreate):
(WKSerializedScriptValueCreateWithInternalRepresentation):
* Shared/API/c/WKSharedAPICast.h:
(WebKit::toCopiedAPI):
* Shared/API/c/WKUserContentURLPattern.cpp:
(WKUserContentURLPatternGetTypeID):
(WKUserContentURLPatternCreate):
* Shared/SecurityOriginData.cpp:
(WebKit::performAPICallbackWithSecurityOriginDataVector):
* Shared/UserData.cpp:
(WebKit::UserData::encode):
(WebKit::UserData::decode):
* Shared/UserMessageCoders.h:
(WebKit::UserMessageEncoder::baseEncode):
(WebKit::UserMessageDecoder::baseDecode):
* UIProcess/API/APIUIClient.h:
(API::UIClient::exceededDatabaseQuota):
(API::UIClient::decidePolicyForGeolocationPermissionRequest):
(API::UIClient::decidePolicyForUserMediaPermissionRequest):
(API::UIClient::decidePolicyForNotificationPermissionRequest):
* UIProcess/API/C/WKNotification.cpp:
* UIProcess/API/C/WKPage.cpp:
(WKPageSetPageUIClient):
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView evaluateJavaScript:completionHandler:]):
* UIProcess/Cocoa/UIDelegate.h:
* UIProcess/Cocoa/UIDelegate.mm:
(WebKit::UIDelegate::UIClient::exceededDatabaseQuota):
* UIProcess/GenericCallback.h:
* UIProcess/Notifications/WebNotification.cpp:
(WebKit::WebNotification::WebNotification):
* UIProcess/Notifications/WebNotification.h:
(WebKit::WebNotification::origin):
* UIProcess/Notifications/WebNotificationManagerProxy.cpp:
(WebKit::WebNotificationManagerProxy::providerDidUpdateNotificationPolicy):
(WebKit::WebNotificationManagerProxy::providerDidRemoveNotificationPolicies):
* UIProcess/Notifications/WebNotificationManagerProxy.h:
* UIProcess/Notifications/WebNotificationProvider.cpp:
* UIProcess/Notifications/WebNotificationProvider.h:
* UIProcess/PageClient.h:
(WebKit::PageClient::decidePolicyForGeolocationPermissionRequest):
* UIProcess/WebApplicationCacheManagerProxy.cpp:
(WebKit::WebApplicationCacheManagerProxy::deleteEntriesForOrigin):
* UIProcess/WebApplicationCacheManagerProxy.h:
* UIProcess/WebCookieManagerProxy.cpp:
* UIProcess/WebDatabaseManagerProxy.cpp:
(WebKit::WebDatabaseManagerProxy::didGetDatabasesByOrigin):
(WebKit::WebDatabaseManagerProxy::didGetDatabaseOrigins):
(WebKit::WebDatabaseManagerProxy::deleteDatabaseWithNameForOrigin):
(WebKit::WebDatabaseManagerProxy::deleteDatabasesForOrigin):
(WebKit::WebDatabaseManagerProxy::setQuotaForOrigin):
(WebKit::WebDatabaseManagerProxy::didModifyOrigin):
(WebKit::WebDatabaseManagerProxy::didModifyDatabase):
* UIProcess/WebDatabaseManagerProxy.h:
* UIProcess/WebDatabaseManagerProxyClient.cpp:
(WebKit::WebDatabaseManagerProxyClient::didModifyOrigin):
(WebKit::WebDatabaseManagerProxyClient::didModifyDatabase):
* UIProcess/WebDatabaseManagerProxyClient.h:
* UIProcess/WebKeyValueStorageManager.cpp:
(WebKit::WebKeyValueStorageManager::getKeyValueStorageOrigins):
(WebKit::WebKeyValueStorageManager::getStorageDetailsByOrigin):
(WebKit::WebKeyValueStorageManager::deleteEntriesForOrigin):
* UIProcess/WebKeyValueStorageManager.h:
* UIProcess/WebMediaCacheManagerProxy.cpp:
* UIProcess/WebOriginDataManagerProxy.cpp:
(WebKit::WebOriginDataManagerProxy::didGetOrigins):
(WebKit::WebOriginDataManagerProxy::deleteEntriesForOrigin):
* UIProcess/WebOriginDataManagerProxy.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::runJavaScriptInMainFrame):
(WebKit::WebPageProxy::scriptValueCallback):
(WebKit::WebPageProxy::exceededDatabaseQuota):
(WebKit::WebPageProxy::requestGeolocationPermissionForFrame):
(WebKit::WebPageProxy::requestUserMediaPermissionForFrame):
(WebKit::WebPageProxy::requestNotificationPermission):
* UIProcess/WebPageProxy.h:
* UIProcess/WebResourceCacheManagerProxy.cpp:
(WebKit::WebResourceCacheManagerProxy::clearCacheForOrigin):
* UIProcess/WebResourceCacheManagerProxy.h:
* UIProcess/ios/PageClientImplIOS.h:
* UIProcess/ios/PageClientImplIOS.mm:
(WebKit::PageClientImpl::decidePolicyForGeolocationPermissionRequest):
* UIProcess/ios/WKContentView.h:
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/InjectedBundle/API/APIInjectedBundlePageUIClient.h:
(API::InjectedBundle::PageUIClient::didReachApplicationCacheOriginQuota):
(API::InjectedBundle::PageUIClient::didExceedDatabaseQuota):
* WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
* WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp:
(WebKit::InjectedBundlePageUIClient::didReachApplicationCacheOriginQuota):
(WebKit::InjectedBundlePageUIClient::didExceedDatabaseQuota):
* WebProcess/InjectedBundle/InjectedBundlePageUIClient.h:
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::exceededDatabaseQuota):
(WebKit::WebChromeClient::reachedApplicationCacheOriginQuota):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKSecurityOrigincpp">trunk/Source/WebKit2/Shared/API/c/WKSecurityOrigin.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKSerializedScriptValuecpp">trunk/Source/WebKit2/Shared/API/c/WKSerializedScriptValue.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKSharedAPICasth">trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKUserContentURLPatterncpp">trunk/Source/WebKit2/Shared/API/c/WKUserContentURLPattern.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedSecurityOriginDatacpp">trunk/Source/WebKit2/Shared/SecurityOriginData.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedUserDatacpp">trunk/Source/WebKit2/Shared/UserData.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedUserMessageCodersh">trunk/Source/WebKit2/Shared/UserMessageCoders.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIUIClienth">trunk/Source/WebKit2/UIProcess/API/APIUIClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKNotificationcpp">trunk/Source/WebKit2/UIProcess/API/C/WKNotification.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</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="#trunkSourceWebKit2UIProcessGenericCallbackh">trunk/Source/WebKit2/UIProcess/GenericCallback.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNotificationsWebNotificationcpp">trunk/Source/WebKit2/UIProcess/Notifications/WebNotification.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNotificationsWebNotificationh">trunk/Source/WebKit2/UIProcess/Notifications/WebNotification.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNotificationsWebNotificationManagerProxycpp">trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNotificationsWebNotificationManagerProxyh">trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNotificationsWebNotificationProvidercpp">trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNotificationsWebNotificationProviderh">trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPageClienth">trunk/Source/WebKit2/UIProcess/PageClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebApplicationCacheManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebApplicationCacheManagerProxyh">trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebCookieManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebDatabaseManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebDatabaseManagerProxyh">trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebDatabaseManagerProxyClientcpp">trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxyClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebDatabaseManagerProxyClienth">trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxyClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebKeyValueStorageManagercpp">trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebKeyValueStorageManagerh">trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebMediaCacheManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebOriginDataManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebOriginDataManagerProxyh">trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebResourceCacheManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebResourceCacheManagerProxyh">trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosPageClientImplIOSh">trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosPageClientImplIOSmm">trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewh">trunk/Source/WebKit2/UIProcess/ios/WKContentView.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIAPIInjectedBundlePageUIClienth">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/APIInjectedBundlePageUIClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleFramecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageUIClientcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageUIClienth">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedAPIAPISecurityOriginh">trunk/Source/WebKit2/Shared/API/APISecurityOrigin.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPISerializedScriptValueh">trunk/Source/WebKit2/Shared/API/APISerializedScriptValue.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPIUserContentURLPatternh">trunk/Source/WebKit2/Shared/API/APIUserContentURLPattern.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedWebSecurityOriginh">trunk/Source/WebKit2/Shared/WebSecurityOrigin.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebSerializedScriptValueh">trunk/Source/WebKit2/Shared/WebSerializedScriptValue.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebUserContentURLPatternh">trunk/Source/WebKit2/Shared/WebUserContentURLPattern.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -1,3 +1,134 @@
</span><ins>+2014-12-22 Anders Carlsson <andersca@apple.com>
+
+ Rename a bunch of API classes and move them to Shared/API
+ https://bugs.webkit.org/show_bug.cgi?id=139866
+
+ Reviewed by Sam Weinig.
+
+ * Shared/API/APISecurityOrigin.h: Renamed from Source/WebKit2/Shared/WebSecurityOrigin.h.
+ (API::SecurityOrigin::createFromString):
+ (API::SecurityOrigin::create):
+ (API::SecurityOrigin::securityOrigin):
+ (API::SecurityOrigin::SecurityOrigin):
+ * Shared/API/APISerializedScriptValue.h: Renamed from Source/WebKit2/Shared/WebSerializedScriptValue.h.
+ (API::SerializedScriptValue::create):
+ (API::SerializedScriptValue::adopt):
+ (API::SerializedScriptValue::deserialize):
+ (API::SerializedScriptValue::dataReference):
+ (API::SerializedScriptValue::internalRepresentation):
+ (API::SerializedScriptValue::SerializedScriptValue):
+ * Shared/API/APIUserContentURLPattern.h: Renamed from Source/WebKit2/Shared/WebUserContentURLPattern.h.
+ (API::UserContentURLPattern::create):
+ (API::UserContentURLPattern::host):
+ (API::UserContentURLPattern::scheme):
+ (API::UserContentURLPattern::isValid):
+ (API::UserContentURLPattern::matchesURL):
+ (API::UserContentURLPattern::matchesSubdomains):
+ (API::UserContentURLPattern::patternString):
+ (API::UserContentURLPattern::UserContentURLPattern):
+ * Shared/API/c/WKSecurityOrigin.cpp:
+ (WKSecurityOriginGetTypeID):
+ (WKSecurityOriginCreateFromString):
+ (WKSecurityOriginCreateFromDatabaseIdentifier):
+ (WKSecurityOriginCreate):
+ * Shared/API/c/WKSerializedScriptValue.cpp:
+ (WKSerializedScriptValueGetTypeID):
+ (WKSerializedScriptValueCreate):
+ (WKSerializedScriptValueCreateWithInternalRepresentation):
+ * Shared/API/c/WKSharedAPICast.h:
+ (WebKit::toCopiedAPI):
+ * Shared/API/c/WKUserContentURLPattern.cpp:
+ (WKUserContentURLPatternGetTypeID):
+ (WKUserContentURLPatternCreate):
+ * Shared/SecurityOriginData.cpp:
+ (WebKit::performAPICallbackWithSecurityOriginDataVector):
+ * Shared/UserData.cpp:
+ (WebKit::UserData::encode):
+ (WebKit::UserData::decode):
+ * Shared/UserMessageCoders.h:
+ (WebKit::UserMessageEncoder::baseEncode):
+ (WebKit::UserMessageDecoder::baseDecode):
+ * UIProcess/API/APIUIClient.h:
+ (API::UIClient::exceededDatabaseQuota):
+ (API::UIClient::decidePolicyForGeolocationPermissionRequest):
+ (API::UIClient::decidePolicyForUserMediaPermissionRequest):
+ (API::UIClient::decidePolicyForNotificationPermissionRequest):
+ * UIProcess/API/C/WKNotification.cpp:
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageUIClient):
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView evaluateJavaScript:completionHandler:]):
+ * UIProcess/Cocoa/UIDelegate.h:
+ * UIProcess/Cocoa/UIDelegate.mm:
+ (WebKit::UIDelegate::UIClient::exceededDatabaseQuota):
+ * UIProcess/GenericCallback.h:
+ * UIProcess/Notifications/WebNotification.cpp:
+ (WebKit::WebNotification::WebNotification):
+ * UIProcess/Notifications/WebNotification.h:
+ (WebKit::WebNotification::origin):
+ * UIProcess/Notifications/WebNotificationManagerProxy.cpp:
+ (WebKit::WebNotificationManagerProxy::providerDidUpdateNotificationPolicy):
+ (WebKit::WebNotificationManagerProxy::providerDidRemoveNotificationPolicies):
+ * UIProcess/Notifications/WebNotificationManagerProxy.h:
+ * UIProcess/Notifications/WebNotificationProvider.cpp:
+ * UIProcess/Notifications/WebNotificationProvider.h:
+ * UIProcess/PageClient.h:
+ (WebKit::PageClient::decidePolicyForGeolocationPermissionRequest):
+ * UIProcess/WebApplicationCacheManagerProxy.cpp:
+ (WebKit::WebApplicationCacheManagerProxy::deleteEntriesForOrigin):
+ * UIProcess/WebApplicationCacheManagerProxy.h:
+ * UIProcess/WebCookieManagerProxy.cpp:
+ * UIProcess/WebDatabaseManagerProxy.cpp:
+ (WebKit::WebDatabaseManagerProxy::didGetDatabasesByOrigin):
+ (WebKit::WebDatabaseManagerProxy::didGetDatabaseOrigins):
+ (WebKit::WebDatabaseManagerProxy::deleteDatabaseWithNameForOrigin):
+ (WebKit::WebDatabaseManagerProxy::deleteDatabasesForOrigin):
+ (WebKit::WebDatabaseManagerProxy::setQuotaForOrigin):
+ (WebKit::WebDatabaseManagerProxy::didModifyOrigin):
+ (WebKit::WebDatabaseManagerProxy::didModifyDatabase):
+ * UIProcess/WebDatabaseManagerProxy.h:
+ * UIProcess/WebDatabaseManagerProxyClient.cpp:
+ (WebKit::WebDatabaseManagerProxyClient::didModifyOrigin):
+ (WebKit::WebDatabaseManagerProxyClient::didModifyDatabase):
+ * UIProcess/WebDatabaseManagerProxyClient.h:
+ * UIProcess/WebKeyValueStorageManager.cpp:
+ (WebKit::WebKeyValueStorageManager::getKeyValueStorageOrigins):
+ (WebKit::WebKeyValueStorageManager::getStorageDetailsByOrigin):
+ (WebKit::WebKeyValueStorageManager::deleteEntriesForOrigin):
+ * UIProcess/WebKeyValueStorageManager.h:
+ * UIProcess/WebMediaCacheManagerProxy.cpp:
+ * UIProcess/WebOriginDataManagerProxy.cpp:
+ (WebKit::WebOriginDataManagerProxy::didGetOrigins):
+ (WebKit::WebOriginDataManagerProxy::deleteEntriesForOrigin):
+ * UIProcess/WebOriginDataManagerProxy.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::runJavaScriptInMainFrame):
+ (WebKit::WebPageProxy::scriptValueCallback):
+ (WebKit::WebPageProxy::exceededDatabaseQuota):
+ (WebKit::WebPageProxy::requestGeolocationPermissionForFrame):
+ (WebKit::WebPageProxy::requestUserMediaPermissionForFrame):
+ (WebKit::WebPageProxy::requestNotificationPermission):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebResourceCacheManagerProxy.cpp:
+ (WebKit::WebResourceCacheManagerProxy::clearCacheForOrigin):
+ * UIProcess/WebResourceCacheManagerProxy.h:
+ * UIProcess/ios/PageClientImplIOS.h:
+ * UIProcess/ios/PageClientImplIOS.mm:
+ (WebKit::PageClientImpl::decidePolicyForGeolocationPermissionRequest):
+ * UIProcess/ios/WKContentView.h:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/InjectedBundle/API/APIInjectedBundlePageUIClient.h:
+ (API::InjectedBundle::PageUIClient::didReachApplicationCacheOriginQuota):
+ (API::InjectedBundle::PageUIClient::didExceedDatabaseQuota):
+ * WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
+ * WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp:
+ (WebKit::InjectedBundlePageUIClient::didReachApplicationCacheOriginQuota):
+ (WebKit::InjectedBundlePageUIClient::didExceedDatabaseQuota):
+ * WebProcess/InjectedBundle/InjectedBundlePageUIClient.h:
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::exceededDatabaseQuota):
+ (WebKit::WebChromeClient::reachedApplicationCacheOriginQuota):
+
</ins><span class="cx"> 2014-12-21 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Allow the WebContext's history client to coexist with WKWebView's history delegate
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPISecurityOriginhfromrev177638trunkSourceWebKit2SharedWebSecurityOriginh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/API/APISecurityOrigin.h (from rev 177638, trunk/Source/WebKit2/Shared/WebSecurityOrigin.h) (0 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APISecurityOrigin.h (rev 0)
+++ trunk/Source/WebKit2/Shared/API/APISecurityOrigin.h 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -0,0 +1,67 @@
</span><ins>+/*
+ * Copyright (C) 2010 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.
+ */
+
+#ifndef APISecurityOrigin_h
+#define APISecurityOrigin_h
+
+#include "APIObject.h"
+#include <WebCore/SecurityOrigin.h>
+#include <wtf/PassRefPtr.h>
+
+namespace API {
+
+class SecurityOrigin : public API::ObjectImpl<API::Object::Type::SecurityOrigin> {
+public:
+ static PassRefPtr<SecurityOrigin> createFromString(const WTF::String& string)
+ {
+ return create(WebCore::SecurityOrigin::createFromString(string));
+ }
+
+ static PassRefPtr<SecurityOrigin> create(const WTF::String& protocol, const WTF::String& host, int port)
+ {
+ return create(WebCore::SecurityOrigin::create(protocol, host, port));
+ }
+
+ static PassRefPtr<SecurityOrigin> create(PassRefPtr<WebCore::SecurityOrigin> securityOrigin)
+ {
+ if (!securityOrigin)
+ return 0;
+ return adoptRef(new SecurityOrigin(securityOrigin));
+ }
+
+ WebCore::SecurityOrigin& securityOrigin() const { return *m_securityOrigin; }
+
+private:
+ SecurityOrigin(PassRefPtr<WebCore::SecurityOrigin> securityOrigin)
+ : m_securityOrigin(securityOrigin)
+ {
+ }
+
+ RefPtr<WebCore::SecurityOrigin> m_securityOrigin;
+};
+
+}
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPISerializedScriptValuehfromrev177638trunkSourceWebKit2SharedWebSerializedScriptValueh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/API/APISerializedScriptValue.h (from rev 177638, trunk/Source/WebKit2/Shared/WebSerializedScriptValue.h) (0 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APISerializedScriptValue.h (rev 0)
+++ trunk/Source/WebKit2/Shared/API/APISerializedScriptValue.h 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -0,0 +1,77 @@
</span><ins>+/*
+ * Copyright (C) 2010 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.
+ */
+
+#ifndef APISerializedScriptValue_h
+#define APISerializedScriptValue_h
+
+#include "APIObject.h"
+
+#include "DataReference.h"
+#include <WebCore/SerializedScriptValue.h>
+#include <wtf/RefPtr.h>
+
+namespace API {
+
+class SerializedScriptValue : public API::ObjectImpl<API::Object::Type::SerializedScriptValue> {
+public:
+ static PassRefPtr<SerializedScriptValue> create(PassRefPtr<WebCore::SerializedScriptValue> serializedValue)
+ {
+ return adoptRef(new SerializedScriptValue(serializedValue));
+ }
+
+ static PassRefPtr<SerializedScriptValue> create(JSContextRef context, JSValueRef value, JSValueRef* exception)
+ {
+ RefPtr<WebCore::SerializedScriptValue> serializedValue = WebCore::SerializedScriptValue::create(context, value, exception);
+ if (!serializedValue)
+ return 0;
+ return adoptRef(new SerializedScriptValue(serializedValue.get()));
+ }
+
+ static PassRefPtr<SerializedScriptValue> adopt(Vector<uint8_t>& buffer)
+ {
+ return adoptRef(new SerializedScriptValue(WebCore::SerializedScriptValue::adopt(buffer)));
+ }
+
+ JSValueRef deserialize(JSContextRef context, JSValueRef* exception)
+ {
+ return m_serializedScriptValue->deserialize(context, exception);
+ }
+
+ IPC::DataReference dataReference() const { return m_serializedScriptValue->data(); }
+
+ void* internalRepresentation() { return m_serializedScriptValue.get(); }
+
+private:
+ explicit SerializedScriptValue(PassRefPtr<WebCore::SerializedScriptValue> serializedScriptValue)
+ : m_serializedScriptValue(serializedScriptValue)
+ {
+ }
+
+ RefPtr<WebCore::SerializedScriptValue> m_serializedScriptValue;
+};
+
+}
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPIUserContentURLPatternhfromrev177638trunkSourceWebKit2SharedWebUserContentURLPatternh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/API/APIUserContentURLPattern.h (from rev 177638, trunk/Source/WebKit2/Shared/WebUserContentURLPattern.h) (0 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APIUserContentURLPattern.h (rev 0)
+++ trunk/Source/WebKit2/Shared/API/APIUserContentURLPattern.h 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -0,0 +1,65 @@
</span><ins>+/*
+ * Copyright (C) 2010 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.
+ */
+
+#ifndef APIUserContentURLPattern_h
+#define APIUserContentURLPattern_h
+
+#include "APIObject.h"
+
+#include <WebCore/URL.h>
+#include <WebCore/UserContentURLPattern.h>
+#include <wtf/RefPtr.h>
+
+namespace API {
+
+class UserContentURLPattern : public API::ObjectImpl<API::Object::Type::UserContentURLPattern> {
+public:
+ static PassRefPtr<UserContentURLPattern> create(const WTF::String& pattern)
+ {
+ return adoptRef(new UserContentURLPattern(pattern));
+ }
+
+ const WTF::String& host() const { return m_pattern.host(); }
+ const WTF::String& scheme() const { return m_pattern.scheme(); }
+ bool isValid() const { return m_pattern.isValid(); };
+ bool matchesURL(const WTF::String& url) const { return m_pattern.matches(WebCore::URL(WebCore::ParsedURLString, url)); }
+ bool matchesSubdomains() const { return m_pattern.matchSubdomains(); }
+
+ const WTF::String& patternString() const { return m_patternString; }
+
+private:
+ explicit UserContentURLPattern(const WTF::String& pattern)
+ : m_pattern(WebCore::UserContentURLPattern(pattern))
+ , m_patternString(pattern)
+ {
+ }
+
+ WebCore::UserContentURLPattern m_pattern;
+ WTF::String m_patternString;
+};
+
+}
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKSecurityOrigincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKSecurityOrigin.cpp (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKSecurityOrigin.cpp 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/Shared/API/c/WKSecurityOrigin.cpp 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -26,29 +26,29 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WKSecurityOrigin.h"
</span><span class="cx">
</span><ins>+#include "APISecurityOrigin.h"
</ins><span class="cx"> #include "WKAPICast.h"
</span><del>-#include "WebSecurityOrigin.h"
</del><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="cx"> WKTypeID WKSecurityOriginGetTypeID()
</span><span class="cx"> {
</span><del>- return toAPI(WebSecurityOrigin::APIType);
</del><ins>+ return toAPI(API::SecurityOrigin::APIType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKSecurityOriginRef WKSecurityOriginCreateFromString(WKStringRef string)
</span><span class="cx"> {
</span><del>- return toAPI(WebSecurityOrigin::create(WebCore::SecurityOrigin::createFromString(toImpl(string)->string())).leakRef());
</del><ins>+ return toAPI(API::SecurityOrigin::create(WebCore::SecurityOrigin::createFromString(toImpl(string)->string())).leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKSecurityOriginRef WKSecurityOriginCreateFromDatabaseIdentifier(WKStringRef identifier)
</span><span class="cx"> {
</span><del>- return toAPI(WebSecurityOrigin::create(WebCore::SecurityOrigin::createFromDatabaseIdentifier((toImpl(identifier)->string()))).leakRef());
</del><ins>+ return toAPI(API::SecurityOrigin::create(WebCore::SecurityOrigin::createFromDatabaseIdentifier((toImpl(identifier)->string()))).leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKSecurityOriginRef WKSecurityOriginCreate(WKStringRef protocol, WKStringRef host, int port)
</span><span class="cx"> {
</span><del>- RefPtr<WebSecurityOrigin> securityOrigin = WebSecurityOrigin::create(toImpl(protocol)->string(), toImpl(host)->string(), port);
</del><ins>+ RefPtr<API::SecurityOrigin> securityOrigin = API::SecurityOrigin::create(toImpl(protocol)->string(), toImpl(host)->string(), port);
</ins><span class="cx"> return toAPI(securityOrigin.release().leakRef());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKSerializedScriptValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKSerializedScriptValue.cpp (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKSerializedScriptValue.cpp 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/Shared/API/c/WKSerializedScriptValue.cpp 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -27,25 +27,25 @@
</span><span class="cx"> #include "WKSerializedScriptValue.h"
</span><span class="cx"> #include "WKSerializedScriptValuePrivate.h"
</span><span class="cx">
</span><ins>+#include "APISerializedScriptValue.h"
</ins><span class="cx"> #include "WKAPICast.h"
</span><del>-#include "WebSerializedScriptValue.h"
</del><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="cx"> WKTypeID WKSerializedScriptValueGetTypeID()
</span><span class="cx"> {
</span><del>- return toAPI(WebSerializedScriptValue::APIType);
</del><ins>+ return toAPI(API::SerializedScriptValue::APIType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKSerializedScriptValueRef WKSerializedScriptValueCreate(JSContextRef context, JSValueRef value, JSValueRef* exception)
</span><span class="cx"> {
</span><del>- RefPtr<WebSerializedScriptValue> serializedValue = WebSerializedScriptValue::create(context, value, exception);
</del><ins>+ RefPtr<API::SerializedScriptValue> serializedValue = API::SerializedScriptValue::create(context, value, exception);
</ins><span class="cx"> return toAPI(serializedValue.release().leakRef());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKSerializedScriptValueRef WKSerializedScriptValueCreateWithInternalRepresentation(void* internalRepresentation)
</span><span class="cx"> {
</span><del>- RefPtr<WebSerializedScriptValue> serializedValue = WebSerializedScriptValue::create(static_cast<WebCore::SerializedScriptValue*>(internalRepresentation));
</del><ins>+ RefPtr<API::SerializedScriptValue> serializedValue = API::SerializedScriptValue::create(static_cast<WebCore::SerializedScriptValue*>(internalRepresentation));
</ins><span class="cx"> return toAPI(serializedValue.release().leakRef());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKSharedAPICasth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "APIError.h"
</span><span class="cx"> #include "APINumber.h"
</span><ins>+#include "APISecurityOrigin.h"
</ins><span class="cx"> #include "APISession.h"
</span><span class="cx"> #include "APIString.h"
</span><span class="cx"> #include "APIURL.h"
</span><span class="lines">@@ -48,7 +49,6 @@
</span><span class="cx"> #include "WKUserScriptInjectionTime.h"
</span><span class="cx"> #include "WebEvent.h"
</span><span class="cx"> #include "WebFindOptions.h"
</span><del>-#include "WebSecurityOrigin.h"
</del><span class="cx"> #include <WebCore/ContextMenuItem.h>
</span><span class="cx"> #include <WebCore/FloatRect.h>
</span><span class="cx"> #include <WebCore/FrameLoaderTypes.h>
</span><span class="lines">@@ -64,7 +64,10 @@
</span><span class="cx"> class Data;
</span><span class="cx"> class Point;
</span><span class="cx"> class Rect;
</span><ins>+class SecurityOrigin;
+class SerializedScriptValue;
</ins><span class="cx"> class Size;
</span><ins>+class UserContentURLPattern;
</ins><span class="cx"> class WebArchive;
</span><span class="cx"> class WebArchiveResource;
</span><span class="cx"> }
</span><span class="lines">@@ -79,9 +82,6 @@
</span><span class="cx"> class WebContextMenuItem;
</span><span class="cx"> class WebGraphicsContext;
</span><span class="cx"> class WebImage;
</span><del>-class WebSecurityOrigin;
-class WebSerializedScriptValue;
-class WebUserContentURLPattern;
</del><span class="cx">
</span><span class="cx"> template<typename APIType> struct APITypeInfo { };
</span><span class="cx"> template<typename ImplType> struct ImplTypeInfo { };
</span><span class="lines">@@ -104,8 +104,8 @@
</span><span class="cx"> WK_ADD_API_MAPPING(WKMutableDictionaryRef, MutableDictionary)
</span><span class="cx"> WK_ADD_API_MAPPING(WKPointRef, API::Point)
</span><span class="cx"> WK_ADD_API_MAPPING(WKRectRef, API::Rect)
</span><del>-WK_ADD_API_MAPPING(WKSecurityOriginRef, WebSecurityOrigin)
-WK_ADD_API_MAPPING(WKSerializedScriptValueRef, WebSerializedScriptValue)
</del><ins>+WK_ADD_API_MAPPING(WKSecurityOriginRef, API::SecurityOrigin)
+WK_ADD_API_MAPPING(WKSerializedScriptValueRef, API::SerializedScriptValue)
</ins><span class="cx"> WK_ADD_API_MAPPING(WKSizeRef, API::Size)
</span><span class="cx"> WK_ADD_API_MAPPING(WKStringRef, API::String)
</span><span class="cx"> WK_ADD_API_MAPPING(WKTypeRef, API::Object)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> WK_ADD_API_MAPPING(WKURLRef, API::URL)
</span><span class="cx"> WK_ADD_API_MAPPING(WKURLRequestRef, API::URLRequest)
</span><span class="cx"> WK_ADD_API_MAPPING(WKURLResponseRef, API::URLResponse)
</span><del>-WK_ADD_API_MAPPING(WKUserContentURLPatternRef, WebUserContentURLPattern)
</del><ins>+WK_ADD_API_MAPPING(WKUserContentURLPatternRef, API::UserContentURLPattern)
</ins><span class="cx"> WK_ADD_API_MAPPING(WKSessionRef, API::Session)
</span><span class="cx">
</span><span class="cx"> template<> struct APITypeInfo<WKMutableArrayRef> { typedef API::Array* ImplType; };
</span><span class="lines">@@ -219,7 +219,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!origin)
</span><span class="cx"> return 0;
</span><del>- return toAPI(WebSecurityOrigin::create(origin).leakRef());
</del><ins>+ return toAPI(API::SecurityOrigin::create(origin).leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Geometry conversions */
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKUserContentURLPatterncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKUserContentURLPattern.cpp (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKUserContentURLPattern.cpp 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/Shared/API/c/WKUserContentURLPattern.cpp 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -26,20 +26,20 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WKUserContentURLPattern.h"
</span><span class="cx">
</span><ins>+#include "APIUserContentURLPattern.h"
</ins><span class="cx"> #include "WKAPICast.h"
</span><span class="cx"> #include "WKString.h"
</span><del>-#include "WebUserContentURLPattern.h"
</del><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="cx"> WKTypeID WKUserContentURLPatternGetTypeID()
</span><span class="cx"> {
</span><del>- return toAPI(WebUserContentURLPattern::APIType);
</del><ins>+ return toAPI(API::UserContentURLPattern::APIType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKUserContentURLPatternRef WKUserContentURLPatternCreate(WKStringRef patternRef)
</span><span class="cx"> {
</span><del>- RefPtr<WebUserContentURLPattern> userContentURLPattern = WebUserContentURLPattern::create(toImpl(patternRef)->string());
</del><ins>+ RefPtr<API::UserContentURLPattern> userContentURLPattern = API::UserContentURLPattern::create(toImpl(patternRef)->string());
</ins><span class="cx"> return toAPI(userContentURLPattern.release().leakRef());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedSecurityOriginDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/SecurityOriginData.cpp (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/SecurityOriginData.cpp 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/Shared/SecurityOriginData.cpp 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><del>-#include "WebSecurityOrigin.h"
</del><ins>+#include "APISecurityOrigin.h"
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> securityOrigins.reserveInitialCapacity(originDatas.size());
</span><span class="cx">
</span><span class="cx"> for (const auto& originData : originDatas) {
</span><del>- RefPtr<API::Object> origin = WebSecurityOrigin::create(originData.protocol, originData.host, originData.port);
</del><ins>+ RefPtr<API::Object> origin = API::SecurityOrigin::create(originData.protocol, originData.host, originData.port);
</ins><span class="cx"> if (!origin)
</span><span class="cx"> continue;
</span><span class="cx"> securityOrigins.uncheckedAppend(WTF::move(origin));
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedUserDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/UserData.cpp (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/UserData.cpp 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/Shared/UserData.cpp 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "APIFrameHandle.h"
</span><span class="cx"> #include "APIGeometry.h"
</span><span class="cx"> #include "APINumber.h"
</span><ins>+#include "APISerializedScriptValue.h"
</ins><span class="cx"> #include "APIString.h"
</span><span class="cx"> #include "APIURL.h"
</span><span class="cx"> #include "APIURLRequest.h"
</span><span class="lines">@@ -39,7 +40,6 @@
</span><span class="cx"> #include "ArgumentCoders.h"
</span><span class="cx"> #include "ArgumentEncoder.h"
</span><span class="cx"> #include "MutableDictionary.h"
</span><del>-#include "WebSerializedScriptValue.h"
</del><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case API::Object::Type::SerializedScriptValue: {
</span><del>- auto& serializedScriptValue = static_cast<const WebSerializedScriptValue&>(object);
</del><ins>+ auto& serializedScriptValue = static_cast<const API::SerializedScriptValue&>(object);
</ins><span class="cx"> encoder << serializedScriptValue.dataReference();
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -295,7 +295,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> auto vector = dataReference.vector();
</span><del>- result = WebSerializedScriptValue::adopt(vector);
</del><ins>+ result = API::SerializedScriptValue::adopt(vector);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedUserMessageCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/UserMessageCoders.h (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/UserMessageCoders.h 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/Shared/UserMessageCoders.h 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -31,10 +31,12 @@
</span><span class="cx"> #include "APIError.h"
</span><span class="cx"> #include "APIGeometry.h"
</span><span class="cx"> #include "APINumber.h"
</span><ins>+#include "APISerializedScriptValue.h"
</ins><span class="cx"> #include "APIString.h"
</span><span class="cx"> #include "APIURL.h"
</span><span class="cx"> #include "APIURLRequest.h"
</span><span class="cx"> #include "APIURLResponse.h"
</span><ins>+#include "APIUserContentURLPattern.h"
</ins><span class="cx"> #include "ArgumentDecoder.h"
</span><span class="cx"> #include "ArgumentEncoder.h"
</span><span class="cx"> #include "DataReference.h"
</span><span class="lines">@@ -45,8 +47,6 @@
</span><span class="cx"> #include "WebImage.h"
</span><span class="cx"> #include "WebRenderLayer.h"
</span><span class="cx"> #include "WebRenderObject.h"
</span><del>-#include "WebSerializedScriptValue.h"
-#include "WebUserContentURLPattern.h"
</del><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> case API::Object::Type::SerializedScriptValue: {
</span><del>- WebSerializedScriptValue* scriptValue = static_cast<WebSerializedScriptValue*>(m_root);
</del><ins>+ API::SerializedScriptValue* scriptValue = static_cast<API::SerializedScriptValue*>(m_root);
</ins><span class="cx"> encoder << scriptValue->dataReference();
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> case API::Object::Type::UserContentURLPattern: {
</span><del>- WebUserContentURLPattern* urlPattern = static_cast<WebUserContentURLPattern*>(m_root);
</del><ins>+ API::UserContentURLPattern* urlPattern = static_cast<API::UserContentURLPattern*>(m_root);
</ins><span class="cx"> encoder << urlPattern->patternString();
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -327,7 +327,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> Vector<uint8_t> vector = dataReference.vector();
</span><del>- coder.m_root = WebSerializedScriptValue::adopt(vector);
</del><ins>+ coder.m_root = API::SerializedScriptValue::adopt(vector);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case API::Object::Type::Double: {
</span><span class="lines">@@ -497,7 +497,7 @@
</span><span class="cx"> String string;
</span><span class="cx"> if (!decoder.decode(string))
</span><span class="cx"> return false;
</span><del>- coder.m_root = WebUserContentURLPattern::create(string);
</del><ins>+ coder.m_root = API::UserContentURLPattern::create(string);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case API::Object::Type::Image: {
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebSecurityOriginh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/WebSecurityOrigin.h (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebSecurityOrigin.h 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/Shared/WebSecurityOrigin.h 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -1,67 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 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.
- */
-
-#ifndef WebSecurityOrigin_h
-#define WebSecurityOrigin_h
-
-#include "APIObject.h"
-#include <WebCore/SecurityOrigin.h>
-#include <wtf/PassRefPtr.h>
-
-namespace WebKit {
-
-class WebSecurityOrigin : public API::ObjectImpl<API::Object::Type::SecurityOrigin> {
-public:
- static PassRefPtr<WebSecurityOrigin> createFromString(const String& string)
- {
- return create(WebCore::SecurityOrigin::createFromString(string));
- }
-
- static PassRefPtr<WebSecurityOrigin> create(const String& protocol, const String& host, int port)
- {
- return create(WebCore::SecurityOrigin::create(protocol, host, port));
- }
-
- static PassRefPtr<WebSecurityOrigin> create(PassRefPtr<WebCore::SecurityOrigin> securityOrigin)
- {
- if (!securityOrigin)
- return 0;
- return adoptRef(new WebSecurityOrigin(securityOrigin));
- }
-
- WebCore::SecurityOrigin& securityOrigin() const { return *m_securityOrigin; }
-
-private:
- WebSecurityOrigin(PassRefPtr<WebCore::SecurityOrigin> securityOrigin)
- : m_securityOrigin(securityOrigin)
- {
- }
-
- RefPtr<WebCore::SecurityOrigin> m_securityOrigin;
-};
-
-} // namespace WebKit
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedWebSerializedScriptValueh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/WebSerializedScriptValue.h (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebSerializedScriptValue.h 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/Shared/WebSerializedScriptValue.h 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -1,77 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 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.
- */
-
-#ifndef WebSerializedScriptValue_h
-#define WebSerializedScriptValue_h
-
-#include "APIObject.h"
-
-#include "DataReference.h"
-#include <WebCore/SerializedScriptValue.h>
-#include <wtf/RefPtr.h>
-
-namespace WebKit {
-
-class WebSerializedScriptValue : public API::ObjectImpl<API::Object::Type::SerializedScriptValue> {
-public:
- static PassRefPtr<WebSerializedScriptValue> create(PassRefPtr<WebCore::SerializedScriptValue> serializedValue)
- {
- return adoptRef(new WebSerializedScriptValue(serializedValue));
- }
-
- static PassRefPtr<WebSerializedScriptValue> create(JSContextRef context, JSValueRef value, JSValueRef* exception)
- {
- RefPtr<WebCore::SerializedScriptValue> serializedValue = WebCore::SerializedScriptValue::create(context, value, exception);
- if (!serializedValue)
- return 0;
- return adoptRef(new WebSerializedScriptValue(serializedValue.get()));
- }
-
- static PassRefPtr<WebSerializedScriptValue> adopt(Vector<uint8_t>& buffer)
- {
- return adoptRef(new WebSerializedScriptValue(WebCore::SerializedScriptValue::adopt(buffer)));
- }
-
- JSValueRef deserialize(JSContextRef context, JSValueRef* exception)
- {
- return m_serializedScriptValue->deserialize(context, exception);
- }
-
- IPC::DataReference dataReference() const { return m_serializedScriptValue->data(); }
-
- void* internalRepresentation() { return m_serializedScriptValue.get(); }
-
-private:
- explicit WebSerializedScriptValue(PassRefPtr<WebCore::SerializedScriptValue> serializedScriptValue)
- : m_serializedScriptValue(serializedScriptValue)
- {
- }
-
- RefPtr<WebCore::SerializedScriptValue> m_serializedScriptValue;
-};
-
-}
-
-#endif // WebSerializedScriptValue_h
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedWebUserContentURLPatternh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/WebUserContentURLPattern.h (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebUserContentURLPattern.h 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/Shared/WebUserContentURLPattern.h 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -1,65 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 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.
- */
-
-#ifndef WebUserContentURLPattern_h
-#define WebUserContentURLPattern_h
-
-#include "APIObject.h"
-
-#include <WebCore/URL.h>
-#include <WebCore/UserContentURLPattern.h>
-#include <wtf/RefPtr.h>
-
-namespace WebKit {
-
-class WebUserContentURLPattern : public API::ObjectImpl<API::Object::Type::UserContentURLPattern> {
-public:
- static PassRefPtr<WebUserContentURLPattern> create(const String& pattern)
- {
- return adoptRef(new WebUserContentURLPattern(pattern));
- }
-
- const String& host() const { return m_pattern.host(); }
- const String& scheme() const { return m_pattern.scheme(); }
- bool isValid() const { return m_pattern.isValid(); };
- bool matchesURL(const String& url) const { return m_pattern.matches(WebCore::URL(WebCore::ParsedURLString, url)); }
- bool matchesSubdomains() const { return m_pattern.matchSubdomains(); }
-
- const String& patternString() const { return m_patternString; }
-
-private:
- explicit WebUserContentURLPattern(const String& pattern)
- : m_pattern(WebCore::UserContentURLPattern(pattern))
- , m_patternString(pattern)
- {
- }
-
- WebCore::UserContentURLPattern m_pattern;
- String m_patternString;
-};
-
-}
-
-#endif // WebUserContentURLPattern_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIUIClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIUIClient.h (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIUIClient.h 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/API/APIUIClient.h 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -56,7 +56,6 @@
</span><span class="cx"> class WebOpenPanelParameters;
</span><span class="cx"> class WebOpenPanelResultListenerProxy;
</span><span class="cx"> class WebPageProxy;
</span><del>-class WebSecurityOrigin;
</del><span class="cx"> struct NavigationActionData;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -64,6 +63,7 @@
</span><span class="cx">
</span><span class="cx"> class Data;
</span><span class="cx"> class Object;
</span><ins>+class SecurityOrigin;
</ins><span class="cx">
</span><span class="cx"> class UIClient {
</span><span class="cx"> public:
</span><span class="lines">@@ -114,7 +114,7 @@
</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 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)
</del><ins>+ virtual void exceededDatabaseQuota(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, SecurityOrigin*, 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><span class="cx"> completionHandler(currentQuota);
</span><span class="cx"> }
</span><span class="lines">@@ -125,9 +125,9 @@
</span><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><del>- virtual bool decidePolicyForGeolocationPermissionRequest(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::WebSecurityOrigin*, WebKit::GeolocationPermissionRequestProxy*) { return false; }
- virtual bool decidePolicyForUserMediaPermissionRequest(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, WebKit::WebSecurityOrigin&, WebKit::UserMediaPermissionRequestProxy&) { return false; }
- virtual bool decidePolicyForNotificationPermissionRequest(WebKit::WebPageProxy*, WebKit::WebSecurityOrigin*, WebKit::NotificationPermissionRequest*) { return false; }
</del><ins>+ virtual bool decidePolicyForGeolocationPermissionRequest(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, SecurityOrigin*, WebKit::GeolocationPermissionRequestProxy*) { return false; }
+ virtual bool decidePolicyForUserMediaPermissionRequest(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, SecurityOrigin&, WebKit::UserMediaPermissionRequestProxy&) { return false; }
+ virtual bool decidePolicyForNotificationPermissionRequest(WebKit::WebPageProxy*, SecurityOrigin*, WebKit::NotificationPermissionRequest*) { return false; }
</ins><span class="cx">
</span><span class="cx"> // Printing.
</span><span class="cx"> virtual float headerHeight(WebKit::WebPageProxy*, WebKit::WebFrameProxy*) { return 0; }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKNotificationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKNotification.cpp (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKNotification.cpp 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKNotification.cpp 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -26,9 +26,9 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WKNotification.h"
</span><span class="cx">
</span><ins>+#include "APISecurityOrigin.h"
</ins><span class="cx"> #include "WKAPICast.h"
</span><span class="cx"> #include "WebNotification.h"
</span><del>-#include "WebSecurityOrigin.h"
</del><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -1477,7 +1477,7 @@
</span><span class="cx"> m_client.pageDidScroll(toAPI(page), m_client.base.clientInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- 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
</del><ins>+ virtual void exceededDatabaseQuota(WebPageProxy* page, WebFrameProxy* frame, API::SecurityOrigin* 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><span class="cx"> completionHandler(currentQuota);
</span><span class="lines">@@ -1496,7 +1496,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual bool decidePolicyForGeolocationPermissionRequest(WebPageProxy* page, WebFrameProxy* frame, WebSecurityOrigin* origin, GeolocationPermissionRequestProxy* permissionRequest) override
</del><ins>+ virtual bool decidePolicyForGeolocationPermissionRequest(WebPageProxy* page, WebFrameProxy* frame, API::SecurityOrigin* origin, GeolocationPermissionRequestProxy* permissionRequest) override
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.decidePolicyForGeolocationPermissionRequest)
</span><span class="cx"> return false;
</span><span class="lines">@@ -1505,7 +1505,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual bool decidePolicyForUserMediaPermissionRequest(WebPageProxy& page, WebFrameProxy& frame, WebSecurityOrigin& origin, UserMediaPermissionRequestProxy& permissionRequest) override
</del><ins>+ virtual bool decidePolicyForUserMediaPermissionRequest(WebPageProxy& page, WebFrameProxy& frame, API::SecurityOrigin& origin, UserMediaPermissionRequestProxy& permissionRequest) override
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.decidePolicyForUserMediaPermissionRequest)
</span><span class="cx"> return false;
</span><span class="lines">@@ -1514,7 +1514,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual bool decidePolicyForNotificationPermissionRequest(WebPageProxy* page, WebSecurityOrigin* origin, NotificationPermissionRequest* permissionRequest) override
</del><ins>+ virtual bool decidePolicyForNotificationPermissionRequest(WebPageProxy* page, API::SecurityOrigin* origin, NotificationPermissionRequest* permissionRequest) override
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.decidePolicyForNotificationPermissionRequest)
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> #import "APIFormClient.h"
</span><ins>+#import "APISerializedScriptValue.h"
</ins><span class="cx"> #import "CompletionHandlerCallChecker.h"
</span><span class="cx"> #import "FindClient.h"
</span><span class="cx"> #import "LegacySessionStateCoding.h"
</span><span class="lines">@@ -65,7 +66,6 @@
</span><span class="cx"> #import "WebPageProxy.h"
</span><span class="cx"> #import "WebPreferencesKeys.h"
</span><span class="cx"> #import "WebProcessProxy.h"
</span><del>-#import "WebSerializedScriptValue.h"
</del><span class="cx"> #import "_WKFindDelegate.h"
</span><span class="cx"> #import "_WKFormDelegate.h"
</span><span class="cx"> #import "_WKRemoteObjectRegistryInternal.h"
</span><span class="lines">@@ -583,7 +583,7 @@
</span><span class="cx"> {
</span><span class="cx"> auto handler = adoptNS([completionHandler copy]);
</span><span class="cx">
</span><del>- _page->runJavaScriptInMainFrame(javaScriptString, [handler](WebKit::WebSerializedScriptValue* serializedScriptValue, WebKit::ScriptValueCallback::Error errorCode) {
</del><ins>+ _page->runJavaScriptInMainFrame(javaScriptString, [handler](API::SerializedScriptValue* serializedScriptValue, WebKit::ScriptValueCallback::Error errorCode) {
</ins><span class="cx"> if (!handler)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaUIDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -66,7 +66,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><del>- 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;
</del><ins>+ virtual void exceededDatabaseQuota(WebPageProxy*, WebFrameProxy*, API::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)>) override;
</ins><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 class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaUIDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> }];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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)
</del><ins>+void UIDelegate::UIClient::exceededDatabaseQuota(WebPageProxy*, WebFrameProxy*, API::SecurityOrigin* 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)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_uiDelegate.m_delegateMethods.webViewDecideDatabaseQuotaForSecurityOriginCurrentQuotaCurrentOriginUsageCurrentDatabaseUsageExpectedUsageDecisionHandler) {
</span><span class="cx"> completionHandler(currentQuota);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessGenericCallbackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/GenericCallback.h (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/GenericCallback.h 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/GenericCallback.h 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -27,10 +27,10 @@
</span><span class="cx"> #define GenericCallback_h
</span><span class="cx">
</span><span class="cx"> #include "APIError.h"
</span><ins>+#include "APISerializedScriptValue.h"
</ins><span class="cx"> #include "ProcessThrottler.h"
</span><span class="cx"> #include "ShareableBitmap.h"
</span><span class="cx"> #include "WKAPICast.h"
</span><del>-#include "WebSerializedScriptValue.h"
</del><span class="cx"> #include <functional>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNotificationsWebNotificationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Notifications/WebNotification.cpp (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Notifications/WebNotification.cpp 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/Notifications/WebNotification.cpp 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> , m_tag(tag)
</span><span class="cx"> , m_lang(lang)
</span><span class="cx"> , m_dir(dir)
</span><del>- , m_origin(WebSecurityOrigin::createFromString(originString))
</del><ins>+ , m_origin(API::SecurityOrigin::createFromString(originString))
</ins><span class="cx"> , m_notificationID(notificationID)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNotificationsWebNotificationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Notifications/WebNotification.h (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Notifications/WebNotification.h 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/Notifications/WebNotification.h 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #define WebNotification_h
</span><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><del>-#include "WebSecurityOrigin.h"
</del><ins>+#include "APISecurityOrigin.h"
</ins><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> const String& tag() const { return m_tag; }
</span><span class="cx"> const String& lang() const { return m_lang; }
</span><span class="cx"> const String& dir() const { return m_dir; }
</span><del>- WebSecurityOrigin* origin() const { return m_origin.get(); }
</del><ins>+ API::SecurityOrigin* origin() const { return m_origin.get(); }
</ins><span class="cx">
</span><span class="cx"> uint64_t notificationID() const { return m_notificationID; }
</span><span class="cx">
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> String m_tag;
</span><span class="cx"> String m_lang;
</span><span class="cx"> String m_dir;
</span><del>- RefPtr<WebSecurityOrigin> m_origin;
</del><ins>+ RefPtr<API::SecurityOrigin> m_origin;
</ins><span class="cx"> uint64_t m_notificationID;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNotificationsWebNotificationManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -27,16 +27,14 @@
</span><span class="cx"> #include "WebNotificationManagerProxy.h"
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><ins>+#include "APISecurityOrigin.h"
</ins><span class="cx"> #include "ImmutableDictionary.h"
</span><span class="cx"> #include "WebContext.h"
</span><span class="cx"> #include "WebNotification.h"
</span><span class="cx"> #include "WebNotificationManagerMessages.h"
</span><span class="cx"> #include "WebPageProxy.h"
</span><span class="cx"> #include "WebProcessProxy.h"
</span><del>-#include "WebSecurityOrigin.h"
</del><span class="cx">
</span><del>-using namespace std;
-using namespace WTF;
</del><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -232,7 +230,7 @@
</span><span class="cx"> it->key->process().send(Messages::WebNotificationManager::DidCloseNotifications(it->value), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebNotificationManagerProxy::providerDidUpdateNotificationPolicy(const WebSecurityOrigin* origin, bool allowed)
</del><ins>+void WebNotificationManagerProxy::providerDidUpdateNotificationPolicy(const API::SecurityOrigin* origin, bool allowed)
</ins><span class="cx"> {
</span><span class="cx"> if (!context())
</span><span class="cx"> return;
</span><span class="lines">@@ -253,7 +251,7 @@
</span><span class="cx"> originStrings.reserveInitialCapacity(size);
</span><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < size; ++i)
</span><del>- originStrings.append(origins->at<WebSecurityOrigin>(i)->securityOrigin().toString());
</del><ins>+ originStrings.append(origins->at<API::SecurityOrigin>(i)->securityOrigin().toString());
</ins><span class="cx">
</span><span class="cx"> context()->sendToAllProcesses(Messages::WebNotificationManager::DidRemoveNotificationDecisions(originStrings));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNotificationsWebNotificationManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -37,13 +37,13 @@
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="cx"> class Array;
</span><ins>+class SecurityOrigin;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class WebContext;
</span><span class="cx"> class WebPageProxy;
</span><del>-class WebSecurityOrigin;
</del><span class="cx">
</span><span class="cx"> class WebNotificationManagerProxy : public API::ObjectImpl<API::Object::Type::NotificationManager>, public WebContextSupplement {
</span><span class="cx"> public:
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> void providerDidShowNotification(uint64_t notificationID);
</span><span class="cx"> void providerDidClickNotification(uint64_t notificationID);
</span><span class="cx"> void providerDidCloseNotifications(API::Array* notificationIDs);
</span><del>- void providerDidUpdateNotificationPolicy(const WebSecurityOrigin*, bool allowed);
</del><ins>+ void providerDidUpdateNotificationPolicy(const API::SecurityOrigin*, bool allowed);
</ins><span class="cx"> void providerDidRemoveNotificationPolicies(API::Array* origins);
</span><span class="cx">
</span><span class="cx"> using API::Object::ref;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNotificationsWebNotificationProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.cpp (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.cpp 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.cpp 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -28,12 +28,12 @@
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><span class="cx"> #include "APINumber.h"
</span><ins>+#include "APISecurityOrigin.h"
</ins><span class="cx"> #include "ImmutableDictionary.h"
</span><span class="cx"> #include "WKAPICast.h"
</span><span class="cx"> #include "WebNotification.h"
</span><span class="cx"> #include "WebNotificationManagerProxy.h"
</span><span class="cx"> #include "WebPageProxy.h"
</span><del>-#include "WebSecurityOrigin.h"
</del><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNotificationsWebNotificationProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.h (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.h 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.h 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx"> class WebNotification;
</span><span class="cx"> class WebNotificationManagerProxy;
</span><span class="cx"> class WebPageProxy;
</span><del>-class WebSecurityOrigin;
</del><span class="cx">
</span><span class="cx"> class WebNotificationProvider : public API::Client<WKNotificationProviderBase> {
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPageClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/PageClient.h 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void toolTipChanged(const String&, const String&) = 0;
</span><span class="cx">
</span><del>- virtual bool decidePolicyForGeolocationPermissionRequest(WebFrameProxy&, WebSecurityOrigin&, GeolocationPermissionRequestProxy&)
</del><ins>+ virtual bool decidePolicyForGeolocationPermissionRequest(WebFrameProxy&, API::SecurityOrigin&, GeolocationPermissionRequestProxy&)
</ins><span class="cx"> {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebApplicationCacheManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.cpp (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.cpp 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.cpp 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -26,11 +26,11 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebApplicationCacheManagerProxy.h"
</span><span class="cx">
</span><ins>+#include "APISecurityOrigin.h"
</ins><span class="cx"> #include "SecurityOriginData.h"
</span><span class="cx"> #include "WebApplicationCacheManagerMessages.h"
</span><span class="cx"> #include "WebApplicationCacheManagerProxyMessages.h"
</span><span class="cx"> #include "WebContext.h"
</span><del>-#include "WebSecurityOrigin.h"
</del><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> performAPICallbackWithSecurityOriginDataVector(originDatas, callback.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebApplicationCacheManagerProxy::deleteEntriesForOrigin(WebSecurityOrigin* origin)
</del><ins>+void WebApplicationCacheManagerProxy::deleteEntriesForOrigin(API::SecurityOrigin* origin)
</ins><span class="cx"> {
</span><span class="cx"> if (!context())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebApplicationCacheManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -35,12 +35,11 @@
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace IPC {
</span><del>- class Connection;
</del><ins>+class Connection;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-class WebSecurityOrigin;
</del><span class="cx"> struct SecurityOriginData;
</span><span class="cx">
</span><span class="cx"> typedef GenericCallback<API::Array*> ArrayCallback;
</span><span class="lines">@@ -53,7 +52,7 @@
</span><span class="cx"> virtual ~WebApplicationCacheManagerProxy();
</span><span class="cx">
</span><span class="cx"> void getApplicationCacheOrigins(std::function<void (API::Array*, CallbackBase::Error)>);
</span><del>- void deleteEntriesForOrigin(WebSecurityOrigin*);
</del><ins>+ void deleteEntriesForOrigin(API::SecurityOrigin*);
</ins><span class="cx"> void deleteAllEntries();
</span><span class="cx">
</span><span class="cx"> using API::Object::ref;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebCookieManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -27,11 +27,11 @@
</span><span class="cx"> #include "WebCookieManagerProxy.h"
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><ins>+#include "APISecurityOrigin.h"
</ins><span class="cx"> #include "SecurityOriginData.h"
</span><span class="cx"> #include "WebContext.h"
</span><span class="cx"> #include "WebCookieManagerMessages.h"
</span><span class="cx"> #include "WebCookieManagerProxyMessages.h"
</span><del>-#include "WebSecurityOrigin.h"
</del><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebDatabaseManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -29,11 +29,11 @@
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><ins>+#include "APISecurityOrigin.h"
</ins><span class="cx"> #include "ImmutableDictionary.h"
</span><span class="cx"> #include "WebContext.h"
</span><span class="cx"> #include "WebDatabaseManagerMessages.h"
</span><span class="cx"> #include "WebDatabaseManagerProxyMessages.h"
</span><del>-#include "WebSecurityOrigin.h"
</del><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> result.reserveInitialCapacity(originAndDatabasesVector.size());
</span><span class="cx">
</span><span class="cx"> for (const auto& originAndDatabases : originAndDatabasesVector) {
</span><del>- RefPtr<API::Object> origin = WebSecurityOrigin::create(SecurityOrigin::createFromDatabaseIdentifier(originAndDatabases.originIdentifier));
</del><ins>+ RefPtr<API::Object> origin = API::SecurityOrigin::create(SecurityOrigin::createFromDatabaseIdentifier(originAndDatabases.originIdentifier));
</ins><span class="cx">
</span><span class="cx"> Vector<RefPtr<API::Object>> databases;
</span><span class="cx"> databases.reserveInitialCapacity(originAndDatabases.databases.size());
</span><span class="lines">@@ -226,17 +226,17 @@
</span><span class="cx"> securityOrigins.reserveInitialCapacity(originIdentifiers.size());
</span><span class="cx">
</span><span class="cx"> for (const auto& originIdentifier : originIdentifiers)
</span><del>- securityOrigins.uncheckedAppend(WebSecurityOrigin::create(SecurityOrigin::createFromDatabaseIdentifier(originIdentifier)));
</del><ins>+ securityOrigins.uncheckedAppend(API::SecurityOrigin::create(SecurityOrigin::createFromDatabaseIdentifier(originIdentifier)));
</ins><span class="cx">
</span><span class="cx"> callback->performCallbackWithReturnValue(API::Array::create(WTF::move(securityOrigins)).get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebDatabaseManagerProxy::deleteDatabaseWithNameForOrigin(const String& databaseIdentifier, WebSecurityOrigin* origin)
</del><ins>+void WebDatabaseManagerProxy::deleteDatabaseWithNameForOrigin(const String& databaseIdentifier, API::SecurityOrigin* origin)
</ins><span class="cx"> {
</span><span class="cx"> context()->sendToOneProcess(Messages::WebDatabaseManager::DeleteDatabaseWithNameForOrigin(databaseIdentifier, origin->securityOrigin().databaseIdentifier()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebDatabaseManagerProxy::deleteDatabasesForOrigin(WebSecurityOrigin* origin)
</del><ins>+void WebDatabaseManagerProxy::deleteDatabasesForOrigin(API::SecurityOrigin* origin)
</ins><span class="cx"> {
</span><span class="cx"> context()->sendToOneProcess(Messages::WebDatabaseManager::DeleteDatabasesForOrigin(origin->securityOrigin().databaseIdentifier()));
</span><span class="cx"> }
</span><span class="lines">@@ -246,20 +246,20 @@
</span><span class="cx"> context()->sendToOneProcess(Messages::WebDatabaseManager::DeleteAllDatabases());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebDatabaseManagerProxy::setQuotaForOrigin(WebSecurityOrigin* origin, uint64_t quota)
</del><ins>+void WebDatabaseManagerProxy::setQuotaForOrigin(API::SecurityOrigin* origin, uint64_t quota)
</ins><span class="cx"> {
</span><span class="cx"> context()->sendToOneProcess(Messages::WebDatabaseManager::SetQuotaForOrigin(origin->securityOrigin().databaseIdentifier(), quota));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebDatabaseManagerProxy::didModifyOrigin(const String& originIdentifier)
</span><span class="cx"> {
</span><del>- RefPtr<WebSecurityOrigin> origin = WebSecurityOrigin::create(SecurityOrigin::createFromDatabaseIdentifier(originIdentifier));
</del><ins>+ RefPtr<API::SecurityOrigin> origin = API::SecurityOrigin::create(SecurityOrigin::createFromDatabaseIdentifier(originIdentifier));
</ins><span class="cx"> m_client.didModifyOrigin(this, origin.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebDatabaseManagerProxy::didModifyDatabase(const String& originIdentifier, const String& databaseIdentifier)
</span><span class="cx"> {
</span><del>- RefPtr<WebSecurityOrigin> origin = WebSecurityOrigin::create(SecurityOrigin::createFromDatabaseIdentifier(originIdentifier));
</del><ins>+ RefPtr<API::SecurityOrigin> origin = API::SecurityOrigin::create(SecurityOrigin::createFromDatabaseIdentifier(originIdentifier));
</ins><span class="cx"> m_client.didModifyDatabase(this, origin.get(), databaseIdentifier);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebDatabaseManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -42,7 +42,6 @@
</span><span class="cx">
</span><span class="cx"> class WebContext;
</span><span class="cx"> class WebProcessProxy;
</span><del>-class WebSecurityOrigin;
</del><span class="cx">
</span><span class="cx"> typedef GenericCallback<API::Array*> ArrayCallback;
</span><span class="cx">
</span><span class="lines">@@ -57,10 +56,10 @@
</span><span class="cx">
</span><span class="cx"> void getDatabasesByOrigin(std::function<void (API::Array*, CallbackBase::Error)>);
</span><span class="cx"> void getDatabaseOrigins(std::function<void (API::Array*, CallbackBase::Error)>);
</span><del>- void deleteDatabaseWithNameForOrigin(const String& databaseIdentifier, WebSecurityOrigin*);
- void deleteDatabasesForOrigin(WebSecurityOrigin*);
</del><ins>+ void deleteDatabaseWithNameForOrigin(const String& databaseIdentifier, API::SecurityOrigin*);
+ void deleteDatabasesForOrigin(API::SecurityOrigin*);
</ins><span class="cx"> void deleteAllDatabases();
</span><del>- void setQuotaForOrigin(WebSecurityOrigin*, uint64_t quota);
</del><ins>+ void setQuotaForOrigin(API::SecurityOrigin*, uint64_t quota);
</ins><span class="cx">
</span><span class="cx"> static String originKey();
</span><span class="cx"> static String originQuotaKey();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebDatabaseManagerProxyClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxyClient.cpp (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxyClient.cpp 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxyClient.cpp 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-void WebDatabaseManagerProxyClient::didModifyOrigin(WebDatabaseManagerProxy* databaseManager, WebSecurityOrigin* origin)
</del><ins>+void WebDatabaseManagerProxyClient::didModifyOrigin(WebDatabaseManagerProxy* databaseManager, API::SecurityOrigin* origin)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.didModifyOrigin)
</span><span class="cx"> return;
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> m_client.didModifyOrigin(toAPI(databaseManager), toAPI(origin), m_client.base.clientInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebDatabaseManagerProxyClient::didModifyDatabase(WebDatabaseManagerProxy* databaseManager, WebSecurityOrigin* origin, const String& databaseIdentifier)
</del><ins>+void WebDatabaseManagerProxyClient::didModifyDatabase(WebDatabaseManagerProxy* databaseManager, API::SecurityOrigin* origin, const String& databaseIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.didModifyDatabase)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebDatabaseManagerProxyClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxyClient.h (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxyClient.h 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxyClient.h 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -34,17 +34,18 @@
</span><span class="cx"> template<> struct ClientTraits<WKDatabaseManagerClientBase> {
</span><span class="cx"> typedef std::tuple<WKDatabaseManagerClientV0> Versions;
</span><span class="cx"> };
</span><ins>+
+class SecurityOrigin;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class WebDatabaseManagerProxy;
</span><del>-class WebSecurityOrigin;
</del><span class="cx">
</span><span class="cx"> class WebDatabaseManagerProxyClient : public API::Client<WKDatabaseManagerClientBase> {
</span><span class="cx"> public:
</span><del>- void didModifyOrigin(WebDatabaseManagerProxy*, WebSecurityOrigin*);
- void didModifyDatabase(WebDatabaseManagerProxy*, WebSecurityOrigin*, const String& databaseIdentifier);
</del><ins>+ void didModifyOrigin(WebDatabaseManagerProxy*, API::SecurityOrigin*);
+ void didModifyDatabase(WebDatabaseManagerProxy*, API::SecurityOrigin*, const String& databaseIdentifier);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebKeyValueStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -27,10 +27,10 @@
</span><span class="cx"> #include "WebKeyValueStorageManager.h"
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><ins>+#include "APISecurityOrigin.h"
</ins><span class="cx"> #include "LocalStorageDetails.h"
</span><span class="cx"> #include "SecurityOriginData.h"
</span><span class="cx"> #include "WebContext.h"
</span><del>-#include "WebSecurityOrigin.h"
</del><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> Vector<RefPtr<API::Object>> webSecurityOrigins;
</span><span class="cx"> webSecurityOrigins.reserveInitialCapacity(securityOrigins.size());
</span><span class="cx"> for (auto& origin : securityOrigins)
</span><del>- webSecurityOrigins.uncheckedAppend(WebSecurityOrigin::create(WTF::move(origin)));
</del><ins>+ webSecurityOrigins.uncheckedAppend(API::SecurityOrigin::create(WTF::move(origin)));
</ins><span class="cx">
</span><span class="cx"> callbackFunction(API::Array::create(WTF::move(webSecurityOrigins)).get(), CallbackBase::Error::None);
</span><span class="cx"> });
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> for (const LocalStorageDetails& originDetails : storageDetails) {
</span><span class="cx"> HashMap<String, RefPtr<API::Object>> detailsMap;
</span><span class="cx">
</span><del>- RefPtr<API::Object> origin = WebSecurityOrigin::create(SecurityOrigin::createFromDatabaseIdentifier(originDetails.originIdentifier));
</del><ins>+ RefPtr<API::Object> origin = API::SecurityOrigin::create(SecurityOrigin::createFromDatabaseIdentifier(originDetails.originIdentifier));
</ins><span class="cx">
</span><span class="cx"> detailsMap.set(WebKeyValueStorageManager::originKey(), origin);
</span><span class="cx"> if (originDetails.creationTime)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebKeyValueStorageManager::deleteEntriesForOrigin(WebSecurityOrigin* origin)
</del><ins>+void WebKeyValueStorageManager::deleteEntriesForOrigin(API::SecurityOrigin* origin)
</ins><span class="cx"> {
</span><span class="cx"> context()->storageManager().deleteEntriesForOrigin(origin->securityOrigin());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebKeyValueStorageManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.h (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.h 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.h 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> void getKeyValueStorageOrigins(std::function<void (API::Array*, CallbackBase::Error)>);
</span><span class="cx"> void getStorageDetailsByOrigin(std::function<void (API::Array*, CallbackBase::Error)>);
</span><del>- void deleteEntriesForOrigin(WebSecurityOrigin*);
</del><ins>+ void deleteEntriesForOrigin(API::SecurityOrigin*);
</ins><span class="cx"> void deleteAllEntries();
</span><span class="cx">
</span><span class="cx"> using API::Object::ref;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebMediaCacheManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -27,10 +27,10 @@
</span><span class="cx"> #include "WebMediaCacheManagerProxy.h"
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><ins>+#include "APISecurityOrigin.h"
</ins><span class="cx"> #include "WebContext.h"
</span><span class="cx"> #include "WebMediaCacheManagerMessages.h"
</span><span class="cx"> #include "WebMediaCacheManagerProxyMessages.h"
</span><del>-#include "WebSecurityOrigin.h"
</del><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebOriginDataManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.cpp (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.cpp 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.cpp 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -26,12 +26,11 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebOriginDataManagerProxy.h"
</span><span class="cx">
</span><ins>+#include "APISecurityOrigin.h"
</ins><span class="cx"> #include "SecurityOriginData.h"
</span><span class="cx"> #include "WebContext.h"
</span><span class="cx"> #include "WebOriginDataManagerMessages.h"
</span><span class="cx"> #include "WebOriginDataManagerProxyMessages.h"
</span><del>-#include "WebSecurityOrigin.h"
-#include <WebCore/SecurityOrigin.h>
</del><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -201,12 +200,12 @@
</span><span class="cx"> securityOrigins.reserveInitialCapacity(originIdentifiers.size());
</span><span class="cx">
</span><span class="cx"> for (const auto& originIdentifier : originIdentifiers)
</span><del>- securityOrigins.uncheckedAppend(WebSecurityOrigin::create(originIdentifier.securityOrigin()));
</del><ins>+ securityOrigins.uncheckedAppend(API::SecurityOrigin::create(originIdentifier.securityOrigin()));
</ins><span class="cx">
</span><span class="cx"> callback->performCallbackWithReturnValue(API::Array::create(WTF::move(securityOrigins)).get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebOriginDataManagerProxy::deleteEntriesForOrigin(WKOriginDataTypes types, WebSecurityOrigin* origin, std::function<void (CallbackBase::Error)> callbackFunction)
</del><ins>+void WebOriginDataManagerProxy::deleteEntriesForOrigin(WKOriginDataTypes types, API::SecurityOrigin* origin, std::function<void (CallbackBase::Error)> callbackFunction)
</ins><span class="cx"> {
</span><span class="cx"> SecurityOriginData securityOriginData;
</span><span class="cx"> securityOriginData.protocol = origin->securityOrigin().protocol();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebOriginDataManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.h (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.h 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.h 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-class WebSecurityOrigin;
</del><span class="cx"> struct SecurityOriginData;
</span><span class="cx">
</span><span class="cx"> typedef GenericCallback<API::Array*> ArrayCallback;
</span><span class="lines">@@ -54,7 +53,7 @@
</span><span class="cx"> virtual ~WebOriginDataManagerProxy();
</span><span class="cx">
</span><span class="cx"> void getOrigins(WKOriginDataTypes, std::function<void (API::Array*, CallbackBase::Error)>);
</span><del>- void deleteEntriesForOrigin(WKOriginDataTypes, WebSecurityOrigin*, std::function<void (CallbackBase::Error)>);
</del><ins>+ void deleteEntriesForOrigin(WKOriginDataTypes, API::SecurityOrigin*, std::function<void (CallbackBase::Error)>);
</ins><span class="cx"> void deleteEntriesModifiedBetweenDates(WKOriginDataTypes, double startDate, double endDate, std::function<void (CallbackBase::Error)>);
</span><span class="cx"> void deleteAllEntries(WKOriginDataTypes, std::function<void (CallbackBase::Error)>);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "APILegacyContextHistoryClient.h"
</span><span class="cx"> #include "APILoaderClient.h"
</span><span class="cx"> #include "APIPolicyClient.h"
</span><ins>+#include "APISecurityOrigin.h"
</ins><span class="cx"> #include "APIUIClient.h"
</span><span class="cx"> #include "APIURLRequest.h"
</span><span class="cx"> #include "AuthenticationChallengeProxy.h"
</span><span class="lines">@@ -87,7 +88,6 @@
</span><span class="cx"> #include "WebProcessMessages.h"
</span><span class="cx"> #include "WebProcessProxy.h"
</span><span class="cx"> #include "WebProtectionSpace.h"
</span><del>-#include "WebSecurityOrigin.h"
</del><span class="cx"> #include "WebUserContentControllerProxy.h"
</span><span class="cx"> #include "WebsiteDataStore.h"
</span><span class="cx"> #include <WebCore/DragController.h>
</span><span class="lines">@@ -2346,7 +2346,7 @@
</span><span class="cx"> m_process->send(Messages::WebPage::CountStringMatches(string, options, maxMatchCount), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::runJavaScriptInMainFrame(const String& script, std::function<void (WebSerializedScriptValue*, CallbackBase::Error)> callbackFunction)
</del><ins>+void WebPageProxy::runJavaScriptInMainFrame(const String& script, std::function<void (API::SerializedScriptValue*, CallbackBase::Error)> callbackFunction)
</ins><span class="cx"> {
</span><span class="cx"> if (!isValid()) {
</span><span class="cx"> callbackFunction(nullptr, CallbackBase::Error::Unknown);
</span><span class="lines">@@ -4387,7 +4387,7 @@
</span><span class="cx"> data.reserveInitialCapacity(dataReference.size());
</span><span class="cx"> data.append(dataReference.data(), dataReference.size());
</span><span class="cx">
</span><del>- callback->performCallbackWithReturnValue(data.size() ? WebSerializedScriptValue::adopt(data).get() : 0);
</del><ins>+ callback->performCallbackWithReturnValue(data.size() ? API::SerializedScriptValue::adopt(data).get() : 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::computedPagesCallback(const Vector<IntRect>& pageRects, double totalScaleFactorForPrinting, uint64_t callbackID)
</span><span class="lines">@@ -4791,7 +4791,7 @@
</span><span class="cx"> WebFrameProxy* frame = m_process->webFrame(record->frameID);
</span><span class="cx"> MESSAGE_CHECK(frame);
</span><span class="cx">
</span><del>- RefPtr<WebSecurityOrigin> origin = WebSecurityOrigin::create(SecurityOrigin::createFromDatabaseIdentifier(record->originIdentifier));
</del><ins>+ RefPtr<API::SecurityOrigin> origin = API::SecurityOrigin::create(SecurityOrigin::createFromDatabaseIdentifier(record->originIdentifier));
</ins><span class="cx"> auto currentReply = record->reply;
</span><span class="cx"> m_uiClient->exceededDatabaseQuota(this, frame, origin.get(),
</span><span class="cx"> record->databaseName, record->displayName, record->currentQuota,
</span><span class="lines">@@ -4816,7 +4816,7 @@
</span><span class="cx"> MESSAGE_CHECK(frame);
</span><span class="cx">
</span><span class="cx"> // FIXME: Geolocation should probably be using toString() as its string representation instead of databaseIdentifier().
</span><del>- RefPtr<WebSecurityOrigin> origin = WebSecurityOrigin::create(SecurityOrigin::createFromDatabaseIdentifier(originIdentifier));
</del><ins>+ RefPtr<API::SecurityOrigin> origin = API::SecurityOrigin::create(SecurityOrigin::createFromDatabaseIdentifier(originIdentifier));
</ins><span class="cx"> RefPtr<GeolocationPermissionRequestProxy> request = m_geolocationPermissionRequestManager.createRequest(geolocationID);
</span><span class="cx">
</span><span class="cx"> if (m_uiClient->decidePolicyForGeolocationPermissionRequest(this, frame, origin.get(), request.get()))
</span><span class="lines">@@ -4833,7 +4833,7 @@
</span><span class="cx"> WebFrameProxy* frame = m_process->webFrame(frameID);
</span><span class="cx"> MESSAGE_CHECK(frame);
</span><span class="cx">
</span><del>- RefPtr<WebSecurityOrigin> origin = WebSecurityOrigin::create(SecurityOrigin::createFromDatabaseIdentifier(originIdentifier));
</del><ins>+ RefPtr<API::SecurityOrigin> origin = API::SecurityOrigin::create(SecurityOrigin::createFromDatabaseIdentifier(originIdentifier));
</ins><span class="cx"> RefPtr<UserMediaPermissionRequestProxy> request = m_userMediaPermissionRequestManager.createRequest(userMediaID, audio, video);
</span><span class="cx">
</span><span class="cx"> if (!m_uiClient->decidePolicyForUserMediaPermissionRequest(*this, *frame, *origin.get(), *request.get()))
</span><span class="lines">@@ -4845,7 +4845,7 @@
</span><span class="cx"> if (!isRequestIDValid(requestID))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<WebSecurityOrigin> origin = WebSecurityOrigin::createFromString(originString);
</del><ins>+ RefPtr<API::SecurityOrigin> origin = API::SecurityOrigin::createFromString(originString);
</ins><span class="cx"> RefPtr<NotificationPermissionRequest> request = m_notificationPermissionRequestManager.createRequest(requestID);
</span><span class="cx">
</span><span class="cx"> if (!m_uiClient->decidePolicyForNotificationPermissionRequest(this, origin.get(), request.get()))
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> typedef GenericCallback<uint64_t> UnsignedCallback;
</span><span class="cx"> typedef GenericCallback<EditingRange> EditingRangeCallback;
</span><span class="cx"> typedef GenericCallback<const String&> StringCallback;
</span><del>-typedef GenericCallback<WebSerializedScriptValue*> ScriptValueCallback;
</del><ins>+typedef GenericCallback<API::SerializedScriptValue*> ScriptValueCallback;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> typedef GenericCallback<API::Error*> PrintFinishedCallback;
</span><span class="lines">@@ -696,7 +696,7 @@
</span><span class="cx"> void getSelectionAsWebArchiveData(std::function<void (API::Data*, CallbackBase::Error)>);
</span><span class="cx"> void getSourceForFrame(WebFrameProxy*, std::function<void (const String&, CallbackBase::Error)>);
</span><span class="cx"> void getWebArchiveOfFrame(WebFrameProxy*, std::function<void (API::Data*, CallbackBase::Error)>);
</span><del>- void runJavaScriptInMainFrame(const String&, std::function<void (WebSerializedScriptValue*, CallbackBase::Error)> callbackFunction);
</del><ins>+ void runJavaScriptInMainFrame(const String&, std::function<void (API::SerializedScriptValue*, CallbackBase::Error)> callbackFunction);
</ins><span class="cx"> void forceRepaint(PassRefPtr<VoidCallback>);
</span><span class="cx">
</span><span class="cx"> float headerHeight(WebFrameProxy*);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebResourceCacheManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.cpp (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.cpp 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.cpp 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -26,12 +26,12 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebResourceCacheManagerProxy.h"
</span><span class="cx">
</span><ins>+#include "APISecurityOrigin.h"
</ins><span class="cx"> #include "ImmutableDictionary.h"
</span><span class="cx"> #include "SecurityOriginData.h"
</span><span class="cx"> #include "WebContext.h"
</span><span class="cx"> #include "WebResourceCacheManagerMessages.h"
</span><span class="cx"> #include "WebResourceCacheManagerProxyMessages.h"
</span><del>-#include "WebSecurityOrigin.h"
</del><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="cx"> #include "NetworkProcessMessages.h"
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> performAPICallbackWithSecurityOriginDataVector(origins, callback.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebResourceCacheManagerProxy::clearCacheForOrigin(WebSecurityOrigin* origin, ResourceCachesToClear cachesToClear)
</del><ins>+void WebResourceCacheManagerProxy::clearCacheForOrigin(API::SecurityOrigin* origin, ResourceCachesToClear cachesToClear)
</ins><span class="cx"> {
</span><span class="cx"> SecurityOriginData securityOrigin;
</span><span class="cx"> securityOrigin.protocol = origin->securityOrigin().protocol();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebResourceCacheManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.h (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.h 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.h 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> struct SecurityOriginData;
</span><span class="cx"> class WebContext;
</span><span class="cx"> class WebProcessProxy;
</span><del>-class WebSecurityOrigin;
</del><span class="cx">
</span><span class="cx"> typedef GenericCallback<API::Array*> ArrayCallback;
</span><span class="cx">
</span><span class="lines">@@ -52,7 +51,7 @@
</span><span class="cx"> virtual ~WebResourceCacheManagerProxy();
</span><span class="cx">
</span><span class="cx"> void getCacheOrigins(std::function<void (API::Array*, CallbackBase::Error)>);
</span><del>- void clearCacheForOrigin(WebSecurityOrigin*, ResourceCachesToClear);
</del><ins>+ void clearCacheForOrigin(API::SecurityOrigin*, ResourceCachesToClear);
</ins><span class="cx"> void clearCacheForAllOrigins(ResourceCachesToClear);
</span><span class="cx">
</span><span class="cx"> using API::Object::ref;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosPageClientImplIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> virtual void pageClosed() override;
</span><span class="cx"> virtual void preferencesDidChange() override;
</span><span class="cx"> virtual void toolTipChanged(const String&, const String&) override;
</span><del>- virtual bool decidePolicyForGeolocationPermissionRequest(WebFrameProxy&, WebSecurityOrigin&, GeolocationPermissionRequestProxy&) override;
</del><ins>+ virtual bool decidePolicyForGeolocationPermissionRequest(WebFrameProxy&, API::SecurityOrigin&, GeolocationPermissionRequestProxy&) override;
</ins><span class="cx"> virtual void didCommitLoadForMainFrame(const String& mimeType, bool useCustomContentProvider) override;
</span><span class="cx"> virtual void handleDownloadRequest(DownloadProxy*) override;
</span><span class="cx"> virtual void setCursor(const WebCore::Cursor&) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosPageClientImplIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool PageClientImpl::decidePolicyForGeolocationPermissionRequest(WebFrameProxy& frame, WebSecurityOrigin& origin, GeolocationPermissionRequestProxy& request)
</del><ins>+bool PageClientImpl::decidePolicyForGeolocationPermissionRequest(WebFrameProxy& frame, API::SecurityOrigin& origin, GeolocationPermissionRequestProxy& request)
</ins><span class="cx"> {
</span><span class="cx"> [[wrapper(m_webView->_page->process().context()) _geolocationProvider] decidePolicyForGeolocationRequestFromOrigin:origin.securityOrigin() frame:frame request:request view:m_webView];
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.h (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentView.h 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentView.h 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -44,7 +44,6 @@
</span><span class="cx"> class WebContext;
</span><span class="cx"> class WebFrameProxy;
</span><span class="cx"> class WebPageProxy;
</span><del>-class WebSecurityOrigin;
</del><span class="cx"> struct WebPageConfiguration;
</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 (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -1690,7 +1690,7 @@
</span><span class="cx"> ED82A7F2128C6FAF004477B3 /* WKBundlePageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A22F0FF1289FCD90085E74F /* WKBundlePageOverlay.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> EDCA71B7128DDA8C00201B26 /* WKBundlePageOverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A22F1001289FCD90085E74F /* WKBundlePageOverlay.cpp */; };
</span><span class="cx"> F036978815F4BF0500C3A80E /* WebColorPicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F036978715F4BF0500C3A80E /* WebColorPicker.cpp */; };
</span><del>- F6113E25126CE1820057D0A7 /* WebUserContentURLPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = F6113E24126CE1820057D0A7 /* WebUserContentURLPattern.h */; };
</del><ins>+ F6113E25126CE1820057D0A7 /* APIUserContentURLPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = F6113E24126CE1820057D0A7 /* APIUserContentURLPattern.h */; };
</ins><span class="cx"> F6113E28126CE19B0057D0A7 /* WKUserContentURLPattern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6113E26126CE19B0057D0A7 /* WKUserContentURLPattern.cpp */; };
</span><span class="cx"> F6113E29126CE19B0057D0A7 /* WKUserContentURLPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = F6113E27126CE19B0057D0A7 /* WKUserContentURLPattern.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> F62A765C12B1ABC30005F1B6 /* WebDatabaseManagerProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F62A765912B1ABC30005F1B6 /* WebDatabaseManagerProxy.cpp */; };
</span><span class="lines">@@ -1701,7 +1701,7 @@
</span><span class="cx"> F62A76B712B1B25F0005F1B6 /* WebDatabaseManagerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = F62A76B312B1B25F0005F1B6 /* WebDatabaseManagerMessages.h */; };
</span><span class="cx"> F62A76B812B1B25F0005F1B6 /* WebDatabaseManagerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F62A76B412B1B25F0005F1B6 /* WebDatabaseManagerProxyMessageReceiver.cpp */; };
</span><span class="cx"> F62A76B912B1B25F0005F1B6 /* WebDatabaseManagerProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = F62A76B512B1B25F0005F1B6 /* WebDatabaseManagerProxyMessages.h */; };
</span><del>- F634445612A885C8000612D8 /* WebSecurityOrigin.h in Headers */ = {isa = PBXBuildFile; fileRef = F634445512A885C8000612D8 /* WebSecurityOrigin.h */; };
</del><ins>+ F634445612A885C8000612D8 /* APISecurityOrigin.h in Headers */ = {isa = PBXBuildFile; fileRef = F634445512A885C8000612D8 /* APISecurityOrigin.h */; };
</ins><span class="cx"> F634445C12A885E9000612D8 /* WKSecurityOrigin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F634445A12A885E9000612D8 /* WKSecurityOrigin.cpp */; };
</span><span class="cx"> F634445D12A885E9000612D8 /* WKSecurityOrigin.h in Headers */ = {isa = PBXBuildFile; fileRef = F634445B12A885E9000612D8 /* WKSecurityOrigin.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> F67DD7BA125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = F67DD7B9125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -3235,7 +3235,7 @@
</span><span class="cx"> A58B6F0618FCA733008CBA53 /* WKFileUploadPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKFileUploadPanel.h; path = ios/forms/WKFileUploadPanel.h; sourceTree = "<group>"; };
</span><span class="cx"> A58B6F0718FCA733008CBA53 /* WKFileUploadPanel.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKFileUploadPanel.mm; path = ios/forms/WKFileUploadPanel.mm; sourceTree = "<group>"; };
</span><span class="cx"> A5EFD38B16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPageVisibilityTypes.h; sourceTree = "<group>"; };
</span><del>- A72D5D7F1236CBA800A88B15 /* WebSerializedScriptValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSerializedScriptValue.h; sourceTree = "<group>"; };
</del><ins>+ A72D5D7F1236CBA800A88B15 /* APISerializedScriptValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APISerializedScriptValue.h; sourceTree = "<group>"; };
</ins><span class="cx"> A78CCDD7193AC9E3005ECC25 /* com.apple.WebKit.Databases.sb */ = {isa = PBXFileReference; lastKnownFileType = text; path = com.apple.WebKit.Databases.sb; sourceTree = "<group>"; };
</span><span class="cx"> A78CCDD8193AC9E3005ECC25 /* com.apple.WebKit.Networking.sb */ = {isa = PBXFileReference; lastKnownFileType = text; path = com.apple.WebKit.Networking.sb; sourceTree = "<group>"; };
</span><span class="cx"> A78CCDD9193AC9E3005ECC25 /* com.apple.WebKit.WebContent.sb */ = {isa = PBXFileReference; lastKnownFileType = text; path = com.apple.WebKit.WebContent.sb; sourceTree = "<group>"; };
</span><span class="lines">@@ -3826,7 +3826,7 @@
</span><span class="cx"> E489D2881A0A2DB80078C06A /* NetworkCacheEncoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCacheEncoder.cpp; sourceTree = "<group>"; };
</span><span class="cx"> E489D2891A0A2DB80078C06A /* NetworkCacheEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCacheEncoder.h; sourceTree = "<group>"; };
</span><span class="cx"> F036978715F4BF0500C3A80E /* WebColorPicker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebColorPicker.cpp; sourceTree = "<group>"; };
</span><del>- F6113E24126CE1820057D0A7 /* WebUserContentURLPattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebUserContentURLPattern.h; sourceTree = "<group>"; };
</del><ins>+ F6113E24126CE1820057D0A7 /* APIUserContentURLPattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIUserContentURLPattern.h; sourceTree = "<group>"; };
</ins><span class="cx"> F6113E26126CE19B0057D0A7 /* WKUserContentURLPattern.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKUserContentURLPattern.cpp; sourceTree = "<group>"; };
</span><span class="cx"> F6113E27126CE19B0057D0A7 /* WKUserContentURLPattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUserContentURLPattern.h; sourceTree = "<group>"; };
</span><span class="cx"> F62A765712B1AB7D0005F1B6 /* WebDatabaseManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebDatabaseManager.messages.in; sourceTree = "<group>"; };
</span><span class="lines">@@ -3839,7 +3839,7 @@
</span><span class="cx"> F62A76B312B1B25F0005F1B6 /* WebDatabaseManagerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDatabaseManagerMessages.h; sourceTree = "<group>"; };
</span><span class="cx"> F62A76B412B1B25F0005F1B6 /* WebDatabaseManagerProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebDatabaseManagerProxyMessageReceiver.cpp; sourceTree = "<group>"; };
</span><span class="cx"> F62A76B512B1B25F0005F1B6 /* WebDatabaseManagerProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDatabaseManagerProxyMessages.h; sourceTree = "<group>"; };
</span><del>- F634445512A885C8000612D8 /* WebSecurityOrigin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSecurityOrigin.h; sourceTree = "<group>"; };
</del><ins>+ F634445512A885C8000612D8 /* APISecurityOrigin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APISecurityOrigin.h; sourceTree = "<group>"; };
</ins><span class="cx"> F634445A12A885E9000612D8 /* WKSecurityOrigin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKSecurityOrigin.cpp; sourceTree = "<group>"; };
</span><span class="cx"> F634445B12A885E9000612D8 /* WKSecurityOrigin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKSecurityOrigin.h; sourceTree = "<group>"; };
</span><span class="cx"> F638954F133BEF38008941D5 /* HTTPCookieAcceptPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTTPCookieAcceptPolicy.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4617,10 +4617,7 @@
</span><span class="cx"> 37948402150C350600E52CE9 /* WebRenderLayer.h */,
</span><span class="cx"> 3760881C150413E900FC82C7 /* WebRenderObject.cpp */,
</span><span class="cx"> 3760881D150413E900FC82C7 /* WebRenderObject.h */,
</span><del>- F634445512A885C8000612D8 /* WebSecurityOrigin.h */,
- A72D5D7F1236CBA800A88B15 /* WebSerializedScriptValue.h */,
</del><span class="cx"> C0337DD7127A51B6008FF4F4 /* WebTouchEvent.cpp */,
</span><del>- F6113E24126CE1820057D0A7 /* WebUserContentURLPattern.h */,
</del><span class="cx"> C0337DD0127A2980008FF4F4 /* WebWheelEvent.cpp */,
</span><span class="cx"> );
</span><span class="cx"> path = Shared;
</span><span class="lines">@@ -6785,6 +6782,9 @@
</span><span class="cx"> children = (
</span><span class="cx"> BCDDB315124EBCFE0048D13C /* C */,
</span><span class="cx"> 37DFA6FE1810BB2D001F4A9F /* Cocoa */,
</span><ins>+ F634445512A885C8000612D8 /* APISecurityOrigin.h */,
+ A72D5D7F1236CBA800A88B15 /* APISerializedScriptValue.h */,
+ F6113E24126CE1820057D0A7 /* APIUserContentURLPattern.h */,
</ins><span class="cx"> );
</span><span class="cx"> path = API;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -7783,7 +7783,7 @@
</span><span class="cx"> 1A002D44196B338900B9AD44 /* _WKSessionState.h in Headers */,
</span><span class="cx"> D3B9484911FF4B6500032B39 /* WebSearchPopupMenu.h in Headers */,
</span><span class="cx"> 1FB00AC9185F76460019142E /* WKWebProcessPlugInPageGroupInternal.h in Headers */,
</span><del>- F634445612A885C8000612D8 /* WebSecurityOrigin.h in Headers */,
</del><ins>+ F634445612A885C8000612D8 /* APISecurityOrigin.h in Headers */,
</ins><span class="cx"> BCC5715B115ADAEF001CCAF9 /* WebSystemInterface.h in Headers */,
</span><span class="cx"> BCA0EF7F12331E78007D3CFB /* WebUndoStep.h in Headers */,
</span><span class="cx"> 1AC1336C18565C7A00F3EC05 /* APIPageHandle.h in Headers */,
</span><span class="lines">@@ -7794,7 +7794,7 @@
</span><span class="cx"> 51C96119183D294700D2002E /* WebIDBServerConnectionMessages.h in Headers */,
</span><span class="cx"> BCE2315D122C30CA00D5C35A /* APIURLRequest.h in Headers */,
</span><span class="cx"> BC90A1D2122DD55E00CC8C50 /* APIURLResponse.h in Headers */,
</span><del>- F6113E25126CE1820057D0A7 /* WebUserContentURLPattern.h in Headers */,
</del><ins>+ F6113E25126CE1820057D0A7 /* APIUserContentURLPattern.h in Headers */,
</ins><span class="cx"> 29CD55AA128E294F00133C85 /* WKAccessibilityWebPageObjectBase.h in Headers */,
</span><span class="cx"> BCDDB32D124EC2E10048D13C /* WKAPICast.h in Headers */,
</span><span class="cx"> 512E34E5130B4D0500ABD19A /* WKApplicationCacheManager.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIAPIInjectedBundlePageUIClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/APIInjectedBundlePageUIClient.h (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/APIInjectedBundlePageUIClient.h 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/APIInjectedBundlePageUIClient.h 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -35,12 +35,12 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> class WebFrame;
</span><span class="cx"> class WebPage;
</span><del>-class WebSecurityOrigin;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="cx">
</span><span class="cx"> class Object;
</span><ins>+class SecurityOrigin;
</ins><span class="cx">
</span><span class="cx"> namespace InjectedBundle {
</span><span class="cx">
</span><span class="lines">@@ -69,8 +69,8 @@
</span><span class="cx"> virtual UIElementVisibility menuBarIsVisible(WebKit::WebPage*) { return UIElementVisibility::Unknown; }
</span><span class="cx"> virtual UIElementVisibility toolbarsAreVisible(WebKit::WebPage*) { return UIElementVisibility::Unknown; }
</span><span class="cx">
</span><del>- virtual bool didReachApplicationCacheOriginQuota(WebKit::WebPage*, WebKit::WebSecurityOrigin*, int64_t totalBytesNeeded) { UNUSED_PARAM(totalBytesNeeded); return false; }
- virtual uint64_t didExceedDatabaseQuota(WebKit::WebPage*, WebKit::WebSecurityOrigin*, const WTF::String& databaseName, const WTF::String& databaseDisplayName, uint64_t currentQuotaBytes, uint64_t currentOriginUsageBytes, uint64_t currentDatabaseUsageBytes, uint64_t expectedUsageBytes)
</del><ins>+ virtual bool didReachApplicationCacheOriginQuota(WebKit::WebPage*, SecurityOrigin*, int64_t totalBytesNeeded) { UNUSED_PARAM(totalBytesNeeded); return false; }
+ virtual uint64_t didExceedDatabaseQuota(WebKit::WebPage*, SecurityOrigin*, const WTF::String& databaseName, const WTF::String& databaseDisplayName, uint64_t currentQuotaBytes, uint64_t currentOriginUsageBytes, uint64_t currentDatabaseUsageBytes, uint64_t expectedUsageBytes)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(databaseName);
</span><span class="cx"> UNUSED_PARAM(databaseDisplayName);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #include "WKBundleFramePrivate.h"
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><ins>+#include "APISecurityOrigin.h"
</ins><span class="cx"> #include "InjectedBundleHitTestResult.h"
</span><span class="cx"> #include "InjectedBundleNodeHandle.h"
</span><span class="cx"> #include "InjectedBundleRangeHandle.h"
</span><span class="lines">@@ -36,7 +37,6 @@
</span><span class="cx"> #include "WKBundleAPICast.h"
</span><span class="cx"> #include "WKData.h"
</span><span class="cx"> #include "WebFrame.h"
</span><del>-#include "WebSecurityOrigin.h"
</del><span class="cx"> #include <WebCore/Document.h>
</span><span class="cx"> #include <WebCore/FocusController.h>
</span><span class="cx"> #include <WebCore/Frame.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageUIClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -26,11 +26,11 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InjectedBundlePageUIClient.h"
</span><span class="cx">
</span><ins>+#include "APISecurityOrigin.h"
</ins><span class="cx"> #include "InjectedBundleHitTestResult.h"
</span><span class="cx"> #include "WKAPICast.h"
</span><span class="cx"> #include "WKBundleAPICast.h"
</span><span class="cx"> #include "WebFrame.h"
</span><del>-#include "WebSecurityOrigin.h"
</del><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> return toUIElementVisibility(m_client.toolbarsAreVisible(toAPI(page), m_client.base.clientInfo));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InjectedBundlePageUIClient::didReachApplicationCacheOriginQuota(WebPage* page, WebSecurityOrigin* origin, int64_t totalBytesNeeded)
</del><ins>+bool InjectedBundlePageUIClient::didReachApplicationCacheOriginQuota(WebPage* page, API::SecurityOrigin* origin, int64_t totalBytesNeeded)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.didReachApplicationCacheOriginQuota)
</span><span class="cx"> return false;
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-uint64_t InjectedBundlePageUIClient::didExceedDatabaseQuota(WebPage* page, WebSecurityOrigin* origin, const String& databaseName, const String& databaseDisplayName, uint64_t currentQuotaBytes, uint64_t currentOriginUsageBytes, uint64_t currentDatabaseUsageBytes, uint64_t expectedUsageBytes)
</del><ins>+uint64_t InjectedBundlePageUIClient::didExceedDatabaseQuota(WebPage* page, API::SecurityOrigin* origin, const String& databaseName, const String& databaseDisplayName, uint64_t currentQuotaBytes, uint64_t currentOriginUsageBytes, uint64_t currentDatabaseUsageBytes, uint64_t expectedUsageBytes)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.didExceedDatabaseQuota)
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageUIClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -62,8 +62,8 @@
</span><span class="cx"> UIElementVisibility menuBarIsVisible(WebPage*) override;
</span><span class="cx"> UIElementVisibility toolbarsAreVisible(WebPage*) override;
</span><span class="cx">
</span><del>- bool didReachApplicationCacheOriginQuota(WebPage*, WebSecurityOrigin*, int64_t totalBytesNeeded) override;
- uint64_t didExceedDatabaseQuota(WebPage*, WebSecurityOrigin*, const String& databaseName, const String& databaseDisplayName, uint64_t currentQuotaBytes, uint64_t currentOriginUsageBytes, uint64_t currentDatabaseUsageBytes, uint64_t expectedUsageBytes) override;
</del><ins>+ bool didReachApplicationCacheOriginQuota(WebPage*, API::SecurityOrigin*, int64_t totalBytesNeeded) override;
+ uint64_t didExceedDatabaseQuota(WebPage*, API::SecurityOrigin*, const String& databaseName, const String& databaseDisplayName, uint64_t currentQuotaBytes, uint64_t currentOriginUsageBytes, uint64_t currentDatabaseUsageBytes, uint64_t expectedUsageBytes) override;
</ins><span class="cx">
</span><span class="cx"> String plugInStartLabelTitle(const String& mimeType) const override;
</span><span class="cx"> String plugInStartLabelSubtitle(const String& mimeType) const override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (177638 => 177639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2014-12-22 19:21:54 UTC (rev 177638)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2014-12-22 19:27:07 UTC (rev 177639)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebChromeClient.h"
</span><span class="cx">
</span><ins>+#include "APISecurityOrigin.h"
</ins><span class="cx"> #include "DrawingArea.h"
</span><span class="cx"> #include "InjectedBundleNavigationAction.h"
</span><span class="cx"> #include "InjectedBundleUserMessageCoders.h"
</span><span class="lines">@@ -48,7 +49,6 @@
</span><span class="cx"> #include "WebProcess.h"
</span><span class="cx"> #include "WebProcessProxyMessages.h"
</span><span class="cx"> #include "WebSearchPopupMenu.h"
</span><del>-#include "WebSecurityOrigin.h"
</del><span class="cx"> #include <WebCore/ApplicationCacheStorage.h>
</span><span class="cx"> #include <WebCore/AXObjectCache.h>
</span><span class="cx"> #include <WebCore/ColorChooser.h>
</span><span class="lines">@@ -681,8 +681,8 @@
</span><span class="cx"> uint64_t currentQuota = dbManager.quotaForOrigin(origin);
</span><span class="cx"> uint64_t currentOriginUsage = dbManager.usageForOrigin(origin);
</span><span class="cx"> uint64_t newQuota = 0;
</span><del>- RefPtr<WebSecurityOrigin> webSecurityOrigin = WebSecurityOrigin::create(WebCore::SecurityOrigin::createFromDatabaseIdentifier(origin->databaseIdentifier()));
- newQuota = m_page->injectedBundleUIClient().didExceedDatabaseQuota(m_page, webSecurityOrigin.get(), databaseName, details.displayName(), currentQuota, currentOriginUsage, details.currentUsage(), details.expectedUsage());
</del><ins>+ RefPtr<API::SecurityOrigin> securityOrigin = API::SecurityOrigin::create(WebCore::SecurityOrigin::createFromDatabaseIdentifier(origin->databaseIdentifier()));
+ newQuota = m_page->injectedBundleUIClient().didExceedDatabaseQuota(m_page, securityOrigin.get(), databaseName, details.displayName(), currentQuota, currentOriginUsage, details.currentUsage(), details.expectedUsage());
</ins><span class="cx">
</span><span class="cx"> if (!newQuota) {
</span><span class="cx"> unsigned syncSendFlags = IPC::InformPlatformProcessWillSuspend;
</span><span class="lines">@@ -706,8 +706,8 @@
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::reachedApplicationCacheOriginQuota(SecurityOrigin* origin, int64_t totalBytesNeeded)
</span><span class="cx"> {
</span><del>- RefPtr<WebSecurityOrigin> webSecurityOrigin = WebSecurityOrigin::createFromString(origin->toString());
- if (m_page->injectedBundleUIClient().didReachApplicationCacheOriginQuota(m_page, webSecurityOrigin.get(), totalBytesNeeded))
</del><ins>+ RefPtr<API::SecurityOrigin> securityOrigin = API::SecurityOrigin::createFromString(origin->toString());
+ if (m_page->injectedBundleUIClient().didReachApplicationCacheOriginQuota(m_page, securityOrigin.get(), totalBytesNeeded))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> unsigned syncSendFlags = IPC::InformPlatformProcessWillSuspend;
</span></span></pre>
</div>
</div>
</body>
</html>