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

Unified Diff: Source/core/html/HTMLFrameElementBase.cpp

Issue 126443005: Use TreeScope::completeURL and baseURL instead of the Document versions (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased again, passes tests Created 6 years, 11 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/html/HTMLFormElement.cpp ('k') | Source/core/html/HTMLHtmlElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLFrameElementBase.cpp
diff --git a/Source/core/html/HTMLFrameElementBase.cpp b/Source/core/html/HTMLFrameElementBase.cpp
index afc9ec57ecb071991be33a40b9d5ecb66dbc698e..4455130a385a120e36ee6614d0a66f32ac937920 100644
--- a/Source/core/html/HTMLFrameElementBase.cpp
+++ b/Source/core/html/HTMLFrameElementBase.cpp
@@ -55,7 +55,7 @@ bool HTMLFrameElementBase::isURLAllowed() const
if (m_URL.isEmpty())
return true;
- const KURL& completeURL = document().completeURL(m_URL);
+ const KURL& completeURL = treeScope().completeURL(m_URL);
if (protocolIsJavaScript(completeURL)) {
Document* contentDoc = this->contentDocument();
@@ -84,7 +84,7 @@ void HTMLFrameElementBase::openURL(bool lockBackForwardList)
// Support for <frame src="javascript:string">
KURL scriptURL;
- KURL url = document().completeURL(m_URL);
+ KURL url = treeScope().completeURL(m_URL);
if (protocolIsJavaScript(m_URL)) {
scriptURL = url;
url = blankURL();
@@ -173,7 +173,7 @@ KURL HTMLFrameElementBase::location() const
{
if (fastHasAttribute(srcdocAttr))
return KURL(ParsedURLString, "about:srcdoc");
- return document().completeURL(getAttribute(srcAttr));
+ return treeScope().completeURL(getAttribute(srcAttr));
}
void HTMLFrameElementBase::setLocation(const String& str)
« no previous file with comments | « Source/core/html/HTMLFormElement.cpp ('k') | Source/core/html/HTMLHtmlElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698