<!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>[177422] trunk/Source</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/177422">177422</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-12-16 17:48:38 -0800 (Tue, 16 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use Ref for SecurityOrigin.
<https://webkit.org/b/139710>
Reviewed by Anders Carlsson.
Source/WebCore:
Make SecurityOrigin::create*() return Ref<SecurityOrigin>.
* html/HTMLAnchorElement.cpp:
(WebCore::HTMLAnchorElement::origin):
* loader/DocumentLoadTiming.cpp:
(WebCore::DocumentLoadTiming::addRedirect):
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::willSendRequest):
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::commitProvisionalLoad):
* loader/PingLoader.cpp:
(WebCore::PingLoader::sendPing):
* loader/appcache/ApplicationCacheHost.cpp:
(WebCore::ApplicationCacheHost::isApplicationCacheBlockedForRequest):
* loader/appcache/ApplicationCacheStorage.cpp:
(WebCore::ApplicationCacheStorage::getOriginsWithCache):
* page/ContentSecurityPolicy.cpp:
(WebCore::stripURLForUseInReport):
* page/DOMWindow.cpp:
(WebCore::DOMWindow::crossDomainAccessErrorMessage):
* page/SecurityOrigin.cpp:
(WebCore::getCachedOrigin):
(WebCore::SecurityOrigin::create):
(WebCore::SecurityOrigin::createUnique):
(WebCore::SecurityOrigin::isolatedCopy):
(WebCore::SecurityOrigin::canRequest):
(WebCore::SecurityOrigin::createFromString):
(WebCore::SecurityOrigin::maybeCreateFromDatabaseIdentifier):
(WebCore::SecurityOrigin::createFromDatabaseIdentifier):
* page/SecurityOrigin.h:
* page/SecurityPolicy.cpp:
(WebCore::SecurityPolicy::isAccessToURLWhiteListed):
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::hasSingleSecurityOrigin):
* storage/StorageTracker.cpp:
(WebCore::StorageTracker::deleteOriginWithIdentifier):
* workers/DefaultSharedWorkerRepository.cpp:
(WebCore::DefaultSharedWorkerRepository::connectToWorker):
* workers/WorkerThread.cpp:
(WebCore::WorkerThreadStartupData::WorkerThreadStartupData):
Source/WebKit/mac:
* Storage/WebStorageTrackerClient.mm:
(WebStorageTrackerClient::dispatchDidModifyOrigin):
* WebView/WebView.mm:
(+[WebView _addOriginAccessWhitelistEntryWithSourceOrigin:destinationProtocol:destinationHost:allowDestinationSubdomains:]):
(+[WebView _removeOriginAccessWhitelistEntryWithSourceOrigin:destinationProtocol:destinationHost:allowDestinationSubdomains:]):
Source/WebKit/win:
* WebDatabaseManager.cpp:
(WebDatabaseManager::setQuota):
* WebView.cpp:
(WebView::addOriginAccessWhitelistEntry):
(WebView::removeOriginAccessWhitelistEntry):
Source/WebKit2:
* DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:
(WebKit::UniqueIDBDatabase::databaseFilenameIdentifier):
* WebProcess/ApplicationCache/WebApplicationCacheManager.cpp:
(WebKit::WebApplicationCacheManager::deleteEntriesForOrigin):
* WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp:
(WebKit::WebIDBServerConnection::WebIDBServerConnection):
* WebProcess/InjectedBundle/InjectedBundle.cpp:
(WebKit::InjectedBundle::addOriginAccessWhitelistEntry):
(WebKit::InjectedBundle::removeOriginAccessWhitelistEntry):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLAnchorElementcpp">trunk/Source/WebCore/html/HTMLAnchorElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadTimingcpp">trunk/Source/WebCore/loader/DocumentLoadTiming.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderPingLoadercpp">trunk/Source/WebCore/loader/PingLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheHostcpp">trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheStoragecpp">trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp</a></li>
<li><a href="#trunkSourceWebCorepageContentSecurityPolicycpp">trunk/Source/WebCore/page/ContentSecurityPolicy.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowcpp">trunk/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSecurityOrigincpp">trunk/Source/WebCore/page/SecurityOrigin.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSecurityOriginh">trunk/Source/WebCore/page/SecurityOrigin.h</a></li>
<li><a href="#trunkSourceWebCorepageSecurityPolicycpp">trunk/Source/WebCore/page/SecurityPolicy.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCorestorageStorageTrackercpp">trunk/Source/WebCore/storage/StorageTracker.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersDefaultSharedWorkerRepositorycpp">trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerThreadcpp">trunk/Source/WebCore/workers/WorkerThread.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacStorageWebStorageTrackerClientmm">trunk/Source/WebKit/mac/Storage/WebStorageTrackerClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebDatabaseManagercpp">trunk/Source/WebKit/win/WebDatabaseManager.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabasecpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessApplicationCacheWebApplicationCacheManagercpp">trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectioncpp">trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177421 => 177422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-17 01:39:55 UTC (rev 177421)
+++ trunk/Source/WebCore/ChangeLog 2014-12-17 01:48:38 UTC (rev 177422)
</span><span class="lines">@@ -1,3 +1,51 @@
</span><ins>+2014-12-16 Andreas Kling <akling@apple.com>
+
+ Use Ref for SecurityOrigin.
+ <https://webkit.org/b/139710>
+
+ Reviewed by Anders Carlsson.
+
+ Make SecurityOrigin::create*() return Ref<SecurityOrigin>.
+
+ * html/HTMLAnchorElement.cpp:
+ (WebCore::HTMLAnchorElement::origin):
+ * loader/DocumentLoadTiming.cpp:
+ (WebCore::DocumentLoadTiming::addRedirect):
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::willSendRequest):
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::commitProvisionalLoad):
+ * loader/PingLoader.cpp:
+ (WebCore::PingLoader::sendPing):
+ * loader/appcache/ApplicationCacheHost.cpp:
+ (WebCore::ApplicationCacheHost::isApplicationCacheBlockedForRequest):
+ * loader/appcache/ApplicationCacheStorage.cpp:
+ (WebCore::ApplicationCacheStorage::getOriginsWithCache):
+ * page/ContentSecurityPolicy.cpp:
+ (WebCore::stripURLForUseInReport):
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::crossDomainAccessErrorMessage):
+ * page/SecurityOrigin.cpp:
+ (WebCore::getCachedOrigin):
+ (WebCore::SecurityOrigin::create):
+ (WebCore::SecurityOrigin::createUnique):
+ (WebCore::SecurityOrigin::isolatedCopy):
+ (WebCore::SecurityOrigin::canRequest):
+ (WebCore::SecurityOrigin::createFromString):
+ (WebCore::SecurityOrigin::maybeCreateFromDatabaseIdentifier):
+ (WebCore::SecurityOrigin::createFromDatabaseIdentifier):
+ * page/SecurityOrigin.h:
+ * page/SecurityPolicy.cpp:
+ (WebCore::SecurityPolicy::isAccessToURLWhiteListed):
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::hasSingleSecurityOrigin):
+ * storage/StorageTracker.cpp:
+ (WebCore::StorageTracker::deleteOriginWithIdentifier):
+ * workers/DefaultSharedWorkerRepository.cpp:
+ (WebCore::DefaultSharedWorkerRepository::connectToWorker):
+ * workers/WorkerThread.cpp:
+ (WebCore::WorkerThreadStartupData::WorkerThreadStartupData):
+
</ins><span class="cx"> 2014-12-16 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Move 'cursor' CSS property to the new StyleBuilder
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAnchorElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAnchorElement.cpp (177421 => 177422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAnchorElement.cpp 2014-12-17 01:39:55 UTC (rev 177421)
+++ trunk/Source/WebCore/html/HTMLAnchorElement.cpp 2014-12-17 01:48:38 UTC (rev 177422)
</span><span class="lines">@@ -488,8 +488,7 @@
</span><span class="cx">
</span><span class="cx"> String HTMLAnchorElement::origin() const
</span><span class="cx"> {
</span><del>- RefPtr<SecurityOrigin> origin = SecurityOrigin::create(href());
- return origin->toString();
</del><ins>+ return SecurityOrigin::create(href()).get().toString();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLAnchorElement::setSearch(const String& value)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadTimingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoadTiming.cpp (177421 => 177422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoadTiming.cpp 2014-12-17 01:39:55 UTC (rev 177421)
+++ trunk/Source/WebCore/loader/DocumentLoadTiming.cpp 2014-12-17 01:48:38 UTC (rev 177422)
</span><span class="lines">@@ -83,8 +83,8 @@
</span><span class="cx"> m_redirectStart = m_fetchStart;
</span><span class="cx"> m_redirectEnd = m_fetchStart = monotonicallyIncreasingTime();
</span><span class="cx"> // Check if the redirected url is allowed to access the redirecting url's timing information.
</span><del>- RefPtr<SecurityOrigin> redirectedSecurityOrigin = SecurityOrigin::create(redirectedUrl);
- m_hasCrossOriginRedirect = !redirectedSecurityOrigin->canRequest(redirectingUrl);
</del><ins>+ Ref<SecurityOrigin> redirectedSecurityOrigin(SecurityOrigin::create(redirectedUrl));
+ m_hasCrossOriginRedirect = !redirectedSecurityOrigin.get().canRequest(redirectingUrl);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (177421 => 177422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2014-12-17 01:39:55 UTC (rev 177421)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2014-12-17 01:48:38 UTC (rev 177422)
</span><span class="lines">@@ -516,8 +516,8 @@
</span><span class="cx"> if (!redirectResponse.isNull()) {
</span><span class="cx"> // If the redirecting url is not allowed to display content from the target origin,
</span><span class="cx"> // then block the redirect.
</span><del>- RefPtr<SecurityOrigin> redirectingOrigin = SecurityOrigin::create(redirectResponse.url());
- if (!redirectingOrigin->canDisplay(newRequest.url())) {
</del><ins>+ Ref<SecurityOrigin> redirectingOrigin(SecurityOrigin::create(redirectResponse.url()));
+ if (!redirectingOrigin.get().canDisplay(newRequest.url())) {
</ins><span class="cx"> FrameLoader::reportLocalLoadFailed(m_frame, newRequest.url().string());
</span><span class="cx"> cancelMainResourceLoad(frameLoader()->cancelledError(newRequest));
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (177421 => 177422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2014-12-17 01:39:55 UTC (rev 177421)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2014-12-17 01:48:38 UTC (rev 177422)
</span><span class="lines">@@ -1782,8 +1782,8 @@
</span><span class="cx">
</span><span class="cx"> if (pdl && m_documentLoader) {
</span><span class="cx"> // Check if the destination page is allowed to access the previous page's timing information.
</span><del>- RefPtr<SecurityOrigin> securityOrigin = SecurityOrigin::create(pdl->request().url());
- m_documentLoader->timing()->setHasSameOriginAsPreviousDocument(securityOrigin->canRequest(m_previousURL));
</del><ins>+ Ref<SecurityOrigin> securityOrigin(SecurityOrigin::create(pdl->request().url()));
+ m_documentLoader->timing()->setHasSameOriginAsPreviousDocument(securityOrigin.get().canRequest(m_previousURL));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Call clientRedirectCancelledOrFinished() here so that the frame load delegate is notified that the redirect's
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderPingLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/PingLoader.cpp (177421 => 177422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/PingLoader.cpp 2014-12-17 01:39:55 UTC (rev 177421)
+++ trunk/Source/WebCore/loader/PingLoader.cpp 2014-12-17 01:48:38 UTC (rev 177422)
</span><span class="lines">@@ -78,12 +78,12 @@
</span><span class="cx"> frame.loader().addExtraFieldsToSubresourceRequest(request);
</span><span class="cx">
</span><span class="cx"> SecurityOrigin* sourceOrigin = frame.document()->securityOrigin();
</span><del>- RefPtr<SecurityOrigin> pingOrigin = SecurityOrigin::create(pingURL);
</del><ins>+ Ref<SecurityOrigin> pingOrigin(SecurityOrigin::create(pingURL));
</ins><span class="cx"> FrameLoader::addHTTPOriginIfNeeded(request, sourceOrigin->toString());
</span><span class="cx"> request.setHTTPHeaderField(HTTPHeaderName::PingTo, destinationURL);
</span><span class="cx"> if (!SecurityPolicy::shouldHideReferrer(pingURL, frame.loader().outgoingReferrer())) {
</span><span class="cx"> request.setHTTPHeaderField(HTTPHeaderName::PingFrom, frame.document()->url());
</span><del>- if (!sourceOrigin->isSameSchemeHostPort(pingOrigin.get())) {
</del><ins>+ if (!sourceOrigin->isSameSchemeHostPort(&pingOrigin.get())) {
</ins><span class="cx"> String referrer = SecurityPolicy::generateReferrerHeader(frame.document()->referrerPolicy(), pingURL, frame.loader().outgoingReferrer());
</span><span class="cx"> if (!referrer.isEmpty())
</span><span class="cx"> request.setHTTPReferrer(referrer);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp (177421 => 177422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp 2014-12-17 01:39:55 UTC (rev 177421)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp 2014-12-17 01:48:38 UTC (rev 177422)
</span><span class="lines">@@ -490,8 +490,8 @@
</span><span class="cx"> if (frame->isMainFrame())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- RefPtr<SecurityOrigin> origin = SecurityOrigin::create(request.url());
- return !origin->canAccessApplicationCache(frame->document()->topOrigin());
</del><ins>+ Ref<SecurityOrigin> origin(SecurityOrigin::create(request.url()));
+ return !origin.get().canAccessApplicationCache(frame->document()->topOrigin());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp (177421 => 177422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp 2014-12-17 01:39:55 UTC (rev 177421)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp 2014-12-17 01:48:38 UTC (rev 177422)
</span><span class="lines">@@ -1567,10 +1567,8 @@
</span><span class="cx"> // Multiple manifest URLs might share the same SecurityOrigin, so we might be creating extra, wasted origins here.
</span><span class="cx"> // The current schema doesn't allow for a more efficient way of building this list.
</span><span class="cx"> size_t count = urls.size();
</span><del>- for (size_t i = 0; i < count; ++i) {
- RefPtr<SecurityOrigin> origin = SecurityOrigin::create(urls[i]);
- origins.add(origin);
- }
</del><ins>+ for (size_t i = 0; i < count; ++i)
+ origins.add(SecurityOrigin::create(urls[i]));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ApplicationCacheStorage::deleteAllEntries()
</span></span></pre></div>
<a id="trunkSourceWebCorepageContentSecurityPolicycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ContentSecurityPolicy.cpp (177421 => 177422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ContentSecurityPolicy.cpp 2014-12-17 01:39:55 UTC (rev 177421)
+++ trunk/Source/WebCore/page/ContentSecurityPolicy.cpp 2014-12-17 01:48:38 UTC (rev 177422)
</span><span class="lines">@@ -1583,7 +1583,7 @@
</span><span class="cx"> return String();
</span><span class="cx"> if (!url.isHierarchical() || url.protocolIs("file"))
</span><span class="cx"> return url.protocol();
</span><del>- return document.securityOrigin()->canRequest(url) ? url.strippedForUseAsReferrer() : SecurityOrigin::create(url)->toString();
</del><ins>+ return document.securityOrigin()->canRequest(url) ? url.strippedForUseAsReferrer() : SecurityOrigin::create(url).get().toString();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSP_NEXT)
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (177421 => 177422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp 2014-12-17 01:39:55 UTC (rev 177421)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2014-12-17 01:48:38 UTC (rev 177422)
</span><span class="lines">@@ -2020,7 +2020,7 @@
</span><span class="cx"> URL activeURL = activeWindow.document()->url();
</span><span class="cx"> URL targetURL = document()->url();
</span><span class="cx"> if (document()->isSandboxed(SandboxOrigin) || activeWindow.document()->isSandboxed(SandboxOrigin)) {
</span><del>- message = "Blocked a frame at \"" + SecurityOrigin::create(activeURL)->toString() + "\" from accessing a frame at \"" + SecurityOrigin::create(targetURL)->toString() + "\". ";
</del><ins>+ message = "Blocked a frame at \"" + SecurityOrigin::create(activeURL).get().toString() + "\" from accessing a frame at \"" + SecurityOrigin::create(targetURL).get().toString() + "\". ";
</ins><span class="cx"> if (document()->isSandboxed(SandboxOrigin) && activeWindow.document()->isSandboxed(SandboxOrigin))
</span><span class="cx"> return "Sandbox access violation: " + message + " Both frames are sandboxed and lack the \"allow-same-origin\" flag.";
</span><span class="cx"> if (document()->isSandboxed(SandboxOrigin))
</span></span></pre></div>
<a id="trunkSourceWebCorepageSecurityOrigincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SecurityOrigin.cpp (177421 => 177422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SecurityOrigin.cpp 2014-12-17 01:39:55 UTC (rev 177421)
+++ trunk/Source/WebCore/page/SecurityOrigin.cpp 2014-12-17 01:48:38 UTC (rev 177422)
</span><span class="lines">@@ -74,11 +74,11 @@
</span><span class="cx"> return URL(ParsedURLString, decodeURLEscapeSequences(url.path()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<SecurityOrigin> getCachedOrigin(const URL& url)
</del><ins>+static RefPtr<SecurityOrigin> getCachedOrigin(const URL& url)
</ins><span class="cx"> {
</span><span class="cx"> if (url.protocolIs("blob"))
</span><span class="cx"> return ThreadableBlobRegistry::getCachedOrigin(url);
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool shouldTreatAsUniqueOrigin(const URL& url)
</span><span class="lines">@@ -163,14 +163,13 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<SecurityOrigin> SecurityOrigin::create(const URL& url)
</del><ins>+Ref<SecurityOrigin> SecurityOrigin::create(const URL& url)
</ins><span class="cx"> {
</span><del>- RefPtr<SecurityOrigin> cachedOrigin = getCachedOrigin(url);
- if (cachedOrigin.get())
- return cachedOrigin;
</del><ins>+ if (RefPtr<SecurityOrigin> cachedOrigin = getCachedOrigin(url))
+ return cachedOrigin.releaseNonNull();
</ins><span class="cx">
</span><span class="cx"> if (shouldTreatAsUniqueOrigin(url)) {
</span><del>- RefPtr<SecurityOrigin> origin = adoptRef(new SecurityOrigin());
</del><ins>+ Ref<SecurityOrigin> origin(adoptRef(*new SecurityOrigin));
</ins><span class="cx">
</span><span class="cx"> if (url.protocolIs("file")) {
</span><span class="cx"> // Unfortunately, we can't represent all unique origins exactly
</span><span class="lines">@@ -180,25 +179,25 @@
</span><span class="cx"> origin->m_needsDatabaseIdentifierQuirkForFiles = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return origin.release();
</del><ins>+ return origin;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (shouldUseInnerURL(url))
</span><del>- return adoptRef(new SecurityOrigin(extractInnerURL(url)));
</del><ins>+ return adoptRef(*new SecurityOrigin(extractInnerURL(url)));
</ins><span class="cx">
</span><del>- return adoptRef(new SecurityOrigin(url));
</del><ins>+ return adoptRef(*new SecurityOrigin(url));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<SecurityOrigin> SecurityOrigin::createUnique()
</del><ins>+Ref<SecurityOrigin> SecurityOrigin::createUnique()
</ins><span class="cx"> {
</span><del>- RefPtr<SecurityOrigin> origin = adoptRef(new SecurityOrigin());
- ASSERT(origin->isUnique());
- return origin.release();
</del><ins>+ Ref<SecurityOrigin> origin(adoptRef(*new SecurityOrigin));
+ ASSERT(origin.get().isUnique());
+ return origin;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<SecurityOrigin> SecurityOrigin::isolatedCopy() const
</del><ins>+Ref<SecurityOrigin> SecurityOrigin::isolatedCopy() const
</ins><span class="cx"> {
</span><del>- return adoptRef(new SecurityOrigin(this));
</del><ins>+ return adoptRef(*new SecurityOrigin(this));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SecurityOrigin::setDomainFromDOM(const String& newDomain)
</span><span class="lines">@@ -289,17 +288,17 @@
</span><span class="cx"> if (isUnique())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- RefPtr<SecurityOrigin> targetOrigin = SecurityOrigin::create(url);
</del><ins>+ Ref<SecurityOrigin> targetOrigin(SecurityOrigin::create(url));
</ins><span class="cx">
</span><span class="cx"> if (targetOrigin->isUnique())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // We call isSameSchemeHostPort here instead of canAccess because we want
</span><span class="cx"> // to ignore document.domain effects.
</span><del>- if (isSameSchemeHostPort(targetOrigin.get()))
</del><ins>+ if (isSameSchemeHostPort(&targetOrigin.get()))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (SecurityPolicy::isAccessWhiteListed(this, targetOrigin.get()))
</del><ins>+ if (SecurityPolicy::isAccessWhiteListed(this, &targetOrigin.get()))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="lines">@@ -488,14 +487,14 @@
</span><span class="cx"> return result.toString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<SecurityOrigin> SecurityOrigin::createFromString(const String& originString)
</del><ins>+Ref<SecurityOrigin> SecurityOrigin::createFromString(const String& originString)
</ins><span class="cx"> {
</span><span class="cx"> return SecurityOrigin::create(URL(URL(), originString));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static const char separatorCharacter = '_';
</span><span class="cx">
</span><del>-PassRefPtr<SecurityOrigin> SecurityOrigin::maybeCreateFromDatabaseIdentifier(const String& databaseIdentifier)
</del><ins>+RefPtr<SecurityOrigin> SecurityOrigin::maybeCreateFromDatabaseIdentifier(const String& databaseIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> // Make sure there's a first separator
</span><span class="cx"> size_t separator1 = databaseIdentifier.find(separatorCharacter);
</span><span class="lines">@@ -530,15 +529,14 @@
</span><span class="cx"> return create(URL(URL(), protocol + "://" + host + ":" + String::number(port) + "/"));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<SecurityOrigin> SecurityOrigin::createFromDatabaseIdentifier(const String& databaseIdentifier)
</del><ins>+Ref<SecurityOrigin> SecurityOrigin::createFromDatabaseIdentifier(const String& databaseIdentifier)
</ins><span class="cx"> {
</span><del>- RefPtr<SecurityOrigin> origin = maybeCreateFromDatabaseIdentifier(databaseIdentifier);
- if (origin)
- return origin.release();
</del><ins>+ if (RefPtr<SecurityOrigin> origin = maybeCreateFromDatabaseIdentifier(databaseIdentifier))
+ return origin.releaseNonNull();
</ins><span class="cx"> return create(URL());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<SecurityOrigin> SecurityOrigin::create(const String& protocol, const String& host, int port)
</del><ins>+Ref<SecurityOrigin> SecurityOrigin::create(const String& protocol, const String& host, int port)
</ins><span class="cx"> {
</span><span class="cx"> if (port < 0 || port > MaxAllowedPort)
</span><span class="cx"> return createUnique();
</span></span></pre></div>
<a id="trunkSourceWebCorepageSecurityOriginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SecurityOrigin.h (177421 => 177422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SecurityOrigin.h 2014-12-17 01:39:55 UTC (rev 177421)
+++ trunk/Source/WebCore/page/SecurityOrigin.h 2014-12-17 01:48:38 UTC (rev 177422)
</span><span class="lines">@@ -50,17 +50,17 @@
</span><span class="cx"> BlockAllStorage
</span><span class="cx"> };
</span><span class="cx">
</span><del>- WEBCORE_EXPORT static PassRefPtr<SecurityOrigin> create(const URL&);
- static PassRefPtr<SecurityOrigin> createUnique();
</del><ins>+ WEBCORE_EXPORT static Ref<SecurityOrigin> create(const URL&);
+ static Ref<SecurityOrigin> createUnique();
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT static PassRefPtr<SecurityOrigin> createFromDatabaseIdentifier(const String&);
</del><ins>+ WEBCORE_EXPORT static Ref<SecurityOrigin> createFromDatabaseIdentifier(const String&);
</ins><span class="cx"> // Alternate form of createFromDatabaseIdentifier that returns a nullptr on failure, instead of an empty origin.
</span><span class="cx"> // FIXME: Many users of createFromDatabaseIdentifier seem to expect maybeCreateFromDatabaseIdentifier behavior,
</span><span class="cx"> // but they aren't getting it so they might be buggy.
</span><del>- WEBCORE_EXPORT static PassRefPtr<SecurityOrigin> maybeCreateFromDatabaseIdentifier(const String&);
</del><ins>+ WEBCORE_EXPORT static RefPtr<SecurityOrigin> maybeCreateFromDatabaseIdentifier(const String&);
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT static PassRefPtr<SecurityOrigin> createFromString(const String&);
- WEBCORE_EXPORT static PassRefPtr<SecurityOrigin> create(const String& protocol, const String& host, int port);
</del><ins>+ WEBCORE_EXPORT static Ref<SecurityOrigin> createFromString(const String&);
+ WEBCORE_EXPORT static Ref<SecurityOrigin> create(const String& protocol, const String& host, int port);
</ins><span class="cx">
</span><span class="cx"> // Some URL schemes use nested URLs for their security context. For example,
</span><span class="cx"> // filesystem URLs look like the following:
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx">
</span><span class="cx"> // Create a deep copy of this SecurityOrigin. This method is useful
</span><span class="cx"> // when marshalling a SecurityOrigin to another thread.
</span><del>- WEBCORE_EXPORT PassRefPtr<SecurityOrigin> isolatedCopy() const;
</del><ins>+ WEBCORE_EXPORT Ref<SecurityOrigin> isolatedCopy() const;
</ins><span class="cx">
</span><span class="cx"> // Set the domain property of this security origin to newDomain. This
</span><span class="cx"> // function does not check whether newDomain is a suffix of the current
</span></span></pre></div>
<a id="trunkSourceWebCorepageSecurityPolicycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SecurityPolicy.cpp (177421 => 177422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SecurityPolicy.cpp 2014-12-17 01:39:55 UTC (rev 177421)
+++ trunk/Source/WebCore/page/SecurityPolicy.cpp 2014-12-17 01:48:38 UTC (rev 177422)
</span><span class="lines">@@ -121,8 +121,8 @@
</span><span class="cx">
</span><span class="cx"> bool SecurityPolicy::isAccessToURLWhiteListed(const SecurityOrigin* activeOrigin, const URL& url)
</span><span class="cx"> {
</span><del>- RefPtr<SecurityOrigin> targetOrigin = SecurityOrigin::create(url);
- return isAccessWhiteListed(activeOrigin, targetOrigin.get());
</del><ins>+ Ref<SecurityOrigin> targetOrigin(SecurityOrigin::create(url));
+ return isAccessWhiteListed(activeOrigin, &targetOrigin.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SecurityPolicy::addOriginAccessWhitelistEntry(const SecurityOrigin& sourceOrigin, const String& destinationProtocol, const String& destinationDomain, bool allowDestinationSubdomains)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (177421 => 177422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-12-17 01:39:55 UTC (rev 177421)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-12-17 01:48:38 UTC (rev 177422)
</span><span class="lines">@@ -2008,9 +2008,9 @@
</span><span class="cx"> if (!m_avAsset || [m_avAsset statusOfValueForKey:@"resolvedURL" error:nullptr] != AVKeyValueStatusLoaded)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- RefPtr<SecurityOrigin> resolvedOrigin = SecurityOrigin::create(resolvedURL());
- RefPtr<SecurityOrigin> requestedOrigin = SecurityOrigin::createFromString(assetURL());
- return resolvedOrigin->isSameSchemeHostPort(requestedOrigin.get());
</del><ins>+ Ref<SecurityOrigin> resolvedOrigin(SecurityOrigin::create(resolvedURL()));
+ Ref<SecurityOrigin> requestedOrigin(SecurityOrigin::createFromString(assetURL()));
+ return resolvedOrigin.get().isSameSchemeHostPort(&requestedOrigin.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if HAVE(AVFOUNDATION_VIDEO_OUTPUT)
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageTracker.cpp (177421 => 177422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageTracker.cpp 2014-12-17 01:39:55 UTC (rev 177421)
+++ trunk/Source/WebCore/storage/StorageTracker.cpp 2014-12-17 01:48:38 UTC (rev 177422)
</span><span class="lines">@@ -476,7 +476,7 @@
</span><span class="cx">
</span><span class="cx"> void StorageTracker::deleteOriginWithIdentifier(const String& originIdentifier)
</span><span class="cx"> {
</span><del>- deleteOrigin(SecurityOrigin::createFromDatabaseIdentifier(originIdentifier).get());
</del><ins>+ deleteOrigin(&SecurityOrigin::createFromDatabaseIdentifier(originIdentifier).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StorageTracker::deleteOrigin(SecurityOrigin* origin)
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersDefaultSharedWorkerRepositorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp (177421 => 177422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp 2014-12-17 01:39:55 UTC (rev 177421)
+++ trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp 2014-12-17 01:48:38 UTC (rev 177422)
</span><span class="lines">@@ -376,7 +376,7 @@
</span><span class="cx"> void DefaultSharedWorkerRepository::connectToWorker(PassRefPtr<SharedWorker> worker, std::unique_ptr<MessagePortChannel> port, const URL& url, const String& name, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> MutexLocker lock(m_lock);
</span><del>- ASSERT(worker->scriptExecutionContext()->securityOrigin()->canAccess(SecurityOrigin::create(url).get()));
</del><ins>+ ASSERT(worker->scriptExecutionContext()->securityOrigin()->canAccess(&SecurityOrigin::create(url).get()));
</ins><span class="cx"> // Fetch a proxy corresponding to this SharedWorker.
</span><span class="cx"> RefPtr<SharedWorkerProxy> proxy = getProxy(name, url);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerThread.cpp (177421 => 177422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerThread.cpp 2014-12-17 01:39:55 UTC (rev 177421)
+++ trunk/Source/WebCore/workers/WorkerThread.cpp 2014-12-17 01:48:38 UTC (rev 177422)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> , m_startMode(startMode)
</span><span class="cx"> , m_contentSecurityPolicy(contentSecurityPolicy.isolatedCopy())
</span><span class="cx"> , m_contentSecurityPolicyType(contentSecurityPolicyType)
</span><del>- , m_topOrigin(topOrigin ? topOrigin->isolatedCopy() : 0)
</del><ins>+ , m_topOrigin(topOrigin ? &topOrigin->isolatedCopy().get() : nullptr)
</ins><span class="cx"> {
</span><span class="cx"> if (!settings)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (177421 => 177422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-12-17 01:39:55 UTC (rev 177421)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-12-17 01:48:38 UTC (rev 177422)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-12-16 Andreas Kling <akling@apple.com>
+
+ Use Ref for SecurityOrigin.
+ <https://webkit.org/b/139710>
+
+ Reviewed by Anders Carlsson.
+
+ * Storage/WebStorageTrackerClient.mm:
+ (WebStorageTrackerClient::dispatchDidModifyOrigin):
+ * WebView/WebView.mm:
+ (+[WebView _addOriginAccessWhitelistEntryWithSourceOrigin:destinationProtocol:destinationHost:allowDestinationSubdomains:]):
+ (+[WebView _removeOriginAccessWhitelistEntryWithSourceOrigin:destinationProtocol:destinationHost:allowDestinationSubdomains:]):
+
</ins><span class="cx"> 2014-12-16 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash getting default animation controller for some text
</span></span></pre></div>
<a id="trunkSourceWebKitmacStorageWebStorageTrackerClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Storage/WebStorageTrackerClient.mm (177421 => 177422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Storage/WebStorageTrackerClient.mm 2014-12-17 01:39:55 UTC (rev 177421)
+++ trunk/Source/WebKit/mac/Storage/WebStorageTrackerClient.mm 2014-12-17 01:48:38 UTC (rev 177422)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">
</span><span class="cx"> void WebStorageTrackerClient::dispatchDidModifyOrigin(const String& originIdentifier)
</span><span class="cx"> {
</span><del>- PassRefPtr<SecurityOrigin> origin = SecurityOrigin::createFromDatabaseIdentifier(originIdentifier);
</del><ins>+ RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromDatabaseIdentifier(originIdentifier);
</ins><span class="cx">
</span><span class="cx"> if (!isMainThread()) {
</span><span class="cx"> // leakRef is balanced by adoptRef in dispatchDidModifyOriginOnMainThread.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (177421 => 177422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-12-17 01:39:55 UTC (rev 177421)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-12-17 01:48:38 UTC (rev 177422)
</span><span class="lines">@@ -3965,12 +3965,12 @@
</span><span class="cx">
</span><span class="cx"> + (void)_addOriginAccessWhitelistEntryWithSourceOrigin:(NSString *)sourceOrigin destinationProtocol:(NSString *)destinationProtocol destinationHost:(NSString *)destinationHost allowDestinationSubdomains:(BOOL)allowDestinationSubdomains
</span><span class="cx"> {
</span><del>- SecurityPolicy::addOriginAccessWhitelistEntry(*SecurityOrigin::createFromString(sourceOrigin), destinationProtocol, destinationHost, allowDestinationSubdomains);
</del><ins>+ SecurityPolicy::addOriginAccessWhitelistEntry(SecurityOrigin::createFromString(sourceOrigin).get(), destinationProtocol, destinationHost, allowDestinationSubdomains);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (void)_removeOriginAccessWhitelistEntryWithSourceOrigin:(NSString *)sourceOrigin destinationProtocol:(NSString *)destinationProtocol destinationHost:(NSString *)destinationHost allowDestinationSubdomains:(BOOL)allowDestinationSubdomains
</span><span class="cx"> {
</span><del>- SecurityPolicy::removeOriginAccessWhitelistEntry(*SecurityOrigin::createFromString(sourceOrigin), destinationProtocol, destinationHost, allowDestinationSubdomains);
</del><ins>+ SecurityPolicy::removeOriginAccessWhitelistEntry(SecurityOrigin::createFromString(sourceOrigin).get(), destinationProtocol, destinationHost, allowDestinationSubdomains);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (void)_resetOriginAccessWhitelists
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (177421 => 177422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2014-12-17 01:39:55 UTC (rev 177421)
+++ trunk/Source/WebKit/win/ChangeLog 2014-12-17 01:48:38 UTC (rev 177422)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-12-16 Andreas Kling <akling@apple.com>
+
+ Use Ref for SecurityOrigin.
+ <https://webkit.org/b/139710>
+
+ Reviewed by Anders Carlsson.
+
+ * WebDatabaseManager.cpp:
+ (WebDatabaseManager::setQuota):
+ * WebView.cpp:
+ (WebView::addOriginAccessWhitelistEntry):
+ (WebView::removeOriginAccessWhitelistEntry):
+
</ins><span class="cx"> 2014-12-11 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (Async Text Input): Text input method state is not reset when reloading a page
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebDatabaseManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebDatabaseManager.cpp (177421 => 177422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebDatabaseManager.cpp 2014-12-17 01:39:55 UTC (rev 177421)
+++ trunk/Source/WebKit/win/WebDatabaseManager.cpp 2014-12-17 01:48:38 UTC (rev 177422)
</span><span class="lines">@@ -382,7 +382,7 @@
</span><span class="cx"> if (this != s_sharedWebDatabaseManager)
</span><span class="cx"> return E_FAIL;
</span><span class="cx">
</span><del>- DatabaseManager::manager().setQuota(SecurityOrigin::createFromString(origin).get(), quota);
</del><ins>+ DatabaseManager::manager().setQuota(SecurityOrigin::createFromString(origin).ptr(), quota);
</ins><span class="cx">
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (177421 => 177422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2014-12-17 01:39:55 UTC (rev 177421)
+++ trunk/Source/WebKit/win/WebView.cpp 2014-12-17 01:48:38 UTC (rev 177422)
</span><span class="lines">@@ -6409,13 +6409,13 @@
</span><span class="cx">
</span><span class="cx"> HRESULT WebView::addOriginAccessWhitelistEntry(BSTR sourceOrigin, BSTR destinationProtocol, BSTR destinationHost, BOOL allowDestinationSubdomains)
</span><span class="cx"> {
</span><del>- SecurityPolicy::addOriginAccessWhitelistEntry(*SecurityOrigin::createFromString(toString(sourceOrigin)), toString(destinationProtocol), toString(destinationHost), allowDestinationSubdomains);
</del><ins>+ SecurityPolicy::addOriginAccessWhitelistEntry(SecurityOrigin::createFromString(toString(sourceOrigin)).get(), toString(destinationProtocol), toString(destinationHost), allowDestinationSubdomains);
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HRESULT WebView::removeOriginAccessWhitelistEntry(BSTR sourceOrigin, BSTR destinationProtocol, BSTR destinationHost, BOOL allowDestinationSubdomains)
</span><span class="cx"> {
</span><del>- SecurityPolicy::removeOriginAccessWhitelistEntry(*SecurityOrigin::createFromString(toString(sourceOrigin)), toString(destinationProtocol), toString(destinationHost), allowDestinationSubdomains);
</del><ins>+ SecurityPolicy::removeOriginAccessWhitelistEntry(SecurityOrigin::createFromString(toString(sourceOrigin)).get(), toString(destinationProtocol), toString(destinationHost), allowDestinationSubdomains);
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177421 => 177422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-17 01:39:55 UTC (rev 177421)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-17 01:48:38 UTC (rev 177422)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-12-16 Andreas Kling <akling@apple.com>
+
+ Use Ref for SecurityOrigin.
+ <https://webkit.org/b/139710>
+
+ Reviewed by Anders Carlsson.
+
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:
+ (WebKit::UniqueIDBDatabase::databaseFilenameIdentifier):
+ * WebProcess/ApplicationCache/WebApplicationCacheManager.cpp:
+ (WebKit::WebApplicationCacheManager::deleteEntriesForOrigin):
+ * WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp:
+ (WebKit::WebIDBServerConnection::WebIDBServerConnection):
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::addOriginAccessWhitelistEntry):
+ (WebKit::InjectedBundle::removeOriginAccessWhitelistEntry):
+
</ins><span class="cx"> 2014-12-16 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove deprecated StorageNamespaceImpl overloads
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp (177421 => 177422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp 2014-12-17 01:39:55 UTC (rev 177421)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp 2014-12-17 01:48:38 UTC (rev 177422)
</span><span class="lines">@@ -93,8 +93,8 @@
</span><span class="cx">
</span><span class="cx"> String UniqueIDBDatabase::databaseFilenameIdentifier(const SecurityOriginData& originData) const
</span><span class="cx"> {
</span><del>- RefPtr<SecurityOrigin> securityOrigin = SecurityOrigin::create(originData.protocol, originData.host, originData.port);
- return securityOrigin->databaseIdentifier();
</del><ins>+ Ref<SecurityOrigin> securityOrigin(SecurityOrigin::create(originData.protocol, originData.host, originData.port));
+ return securityOrigin.get().databaseIdentifier();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabase::canShareDatabases(const SecurityOriginData& openingOrigin, const SecurityOriginData& mainFrameOrigin) const
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessApplicationCacheWebApplicationCacheManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp (177421 => 177422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp 2014-12-17 01:39:55 UTC (rev 177421)
+++ trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp 2014-12-17 01:48:38 UTC (rev 177422)
</span><span class="lines">@@ -78,11 +78,8 @@
</span><span class="cx">
</span><span class="cx"> void WebApplicationCacheManager::deleteEntriesForOrigin(const SecurityOriginData& originData)
</span><span class="cx"> {
</span><del>- RefPtr<SecurityOrigin> origin = SecurityOrigin::create(originData.protocol, originData.host, originData.port);
- if (!origin)
- return;
-
- ApplicationCache::deleteCacheForOrigin(origin.get());
</del><ins>+ Ref<SecurityOrigin> origin(SecurityOrigin::create(originData.protocol, originData.host, originData.port));
+ ApplicationCache::deleteCacheForOrigin(&origin.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebApplicationCacheManager::deleteAllEntries()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp (177421 => 177422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp 2014-12-17 01:39:55 UTC (rev 177421)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp 2014-12-17 01:48:38 UTC (rev 177422)
</span><span class="lines">@@ -62,8 +62,8 @@
</span><span class="cx"> WebIDBServerConnection::WebIDBServerConnection(const String& databaseName, const SecurityOrigin& openingOrigin, const SecurityOrigin& mainFrameOrigin)
</span><span class="cx"> : m_serverConnectionIdentifier(generateServerConnectionIdentifier())
</span><span class="cx"> , m_databaseName(databaseName)
</span><del>- , m_openingOrigin(*openingOrigin.isolatedCopy())
- , m_mainFrameOrigin(*mainFrameOrigin.isolatedCopy())
</del><ins>+ , m_openingOrigin(openingOrigin.isolatedCopy())
+ , m_mainFrameOrigin(mainFrameOrigin.isolatedCopy())
</ins><span class="cx"> {
</span><span class="cx"> send(Messages::DatabaseToWebProcessConnection::EstablishIDBConnection(m_serverConnectionIdentifier));
</span><span class="cx"> send(Messages::DatabaseProcessIDBConnection::EstablishConnection(databaseName, SecurityOriginData::fromSecurityOrigin(&openingOrigin), SecurityOriginData::fromSecurityOrigin(&mainFrameOrigin)));
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (177421 => 177422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2014-12-17 01:39:55 UTC (rev 177421)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2014-12-17 01:48:38 UTC (rev 177422)
</span><span class="lines">@@ -328,12 +328,12 @@
</span><span class="cx">
</span><span class="cx"> void InjectedBundle::addOriginAccessWhitelistEntry(const String& sourceOrigin, const String& destinationProtocol, const String& destinationHost, bool allowDestinationSubdomains)
</span><span class="cx"> {
</span><del>- SecurityPolicy::addOriginAccessWhitelistEntry(*SecurityOrigin::createFromString(sourceOrigin), destinationProtocol, destinationHost, allowDestinationSubdomains);
</del><ins>+ SecurityPolicy::addOriginAccessWhitelistEntry(SecurityOrigin::createFromString(sourceOrigin).get(), destinationProtocol, destinationHost, allowDestinationSubdomains);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundle::removeOriginAccessWhitelistEntry(const String& sourceOrigin, const String& destinationProtocol, const String& destinationHost, bool allowDestinationSubdomains)
</span><span class="cx"> {
</span><del>- SecurityPolicy::removeOriginAccessWhitelistEntry(*SecurityOrigin::createFromString(sourceOrigin), destinationProtocol, destinationHost, allowDestinationSubdomains);
</del><ins>+ SecurityPolicy::removeOriginAccessWhitelistEntry(SecurityOrigin::createFromString(sourceOrigin).get(), destinationProtocol, destinationHost, allowDestinationSubdomains);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundle::resetOriginAccessWhitelists()
</span></span></pre>
</div>
</div>
</body>
</html>