Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(690)

Unified Diff: Source/core/dom/Document.cpp

Issue 246433004: Rename cookieURL to inheritedURL and add inheritedURL() to WebDocument (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: weaken statement about inheritedURL Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/dom/Document.h ('k') | Source/core/loader/CookieJar.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/Document.cpp
diff --git a/Source/core/dom/Document.cpp b/Source/core/dom/Document.cpp
index b35ac06b6f3bcc4d2f9532bc3dc037550b3bc1fe..a76035cbb61c66acc4ee41f1f63dcddec4995f5a 100644
--- a/Source/core/dom/Document.cpp
+++ b/Source/core/dom/Document.cpp
@@ -2260,7 +2260,7 @@ void Document::open(Document* ownerDocument)
{
if (ownerDocument) {
setURL(ownerDocument->url());
- m_cookieURL = ownerDocument->cookieURL();
+ m_inheritedURL = ownerDocument->inheritedURL();
setSecurityOrigin(ownerDocument->securityOrigin());
}
@@ -3870,7 +3870,7 @@ String Document::cookie(ExceptionState& exceptionState) const
return String();
}
- KURL cookieURL = this->cookieURL();
+ KURL cookieURL = this->inheritedURL();
if (cookieURL.isEmpty())
return String();
@@ -3896,7 +3896,7 @@ void Document::setCookie(const String& value, ExceptionState& exceptionState)
return;
}
- KURL cookieURL = this->cookieURL();
+ KURL cookieURL = this->inheritedURL();
if (cookieURL.isEmpty())
return;
@@ -4596,7 +4596,7 @@ void Document::initSecurityContext(const DocumentInit& initializer)
if (!initializer.hasSecurityContext()) {
// No source for a security context.
// This can occur via document.implementation.createDocument().
- m_cookieURL = KURL(ParsedURLString, emptyString());
+ m_inheritedURL = KURL(ParsedURLString, emptyString());
setSecurityOrigin(SecurityOrigin::createUnique());
setContentSecurityPolicy(ContentSecurityPolicy::create(this));
return;
@@ -4604,7 +4604,7 @@ void Document::initSecurityContext(const DocumentInit& initializer)
// In the common case, create the security context from the currently
// loading URL with a fresh content security policy.
- m_cookieURL = m_url;
+ m_inheritedURL = m_url;
enforceSandboxFlags(initializer.sandboxFlags());
setSecurityOrigin(isSandboxed(SandboxOrigin) ? SecurityOrigin::createUnique() : SecurityOrigin::create(m_url));
setContentSecurityPolicy(contentSecurityPolicyFor(this));
@@ -4653,7 +4653,7 @@ void Document::initSecurityContext(const DocumentInit& initializer)
return;
}
- m_cookieURL = initializer.owner()->cookieURL();
+ m_inheritedURL = initializer.owner()->inheritedURL();
// We alias the SecurityOrigins to match Firefox, see Bug 15313
// https://bugs.webkit.org/show_bug.cgi?id=15313
setSecurityOrigin(initializer.owner()->securityOrigin());
« no previous file with comments | « Source/core/dom/Document.h ('k') | Source/core/loader/CookieJar.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698