| 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());
|
|
|