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