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

Unified Diff: Source/core/html/HTMLPlugInElement.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/HTMLObjectElement.cpp ('k') | Source/core/html/HTMLScriptElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLPlugInElement.cpp
diff --git a/Source/core/html/HTMLPlugInElement.cpp b/Source/core/html/HTMLPlugInElement.cpp
index 0b2df23c31693eb216d32f4f308cd4248aba55c8..eca5ab2b8155392ec2154faa64210c3c4a4b90a9 100644
--- a/Source/core/html/HTMLPlugInElement.cpp
+++ b/Source/core/html/HTMLPlugInElement.cpp
@@ -353,7 +353,7 @@ bool HTMLPlugInElement::isImageType()
m_serviceType = mimeTypeFromDataURL(m_url);
if (Frame* frame = document().frame()) {
- KURL completedURL = document().completeURL(m_url);
+ KURL completedURL = treeScope().completeURL(m_url);
return frame->loader().client()->objectContentType(completedURL, m_serviceType, shouldPreferPlugInsForImages()) == ObjectContentImage;
}
@@ -381,7 +381,7 @@ RenderEmbeddedObject* HTMLPlugInElement::renderEmbeddedObject() const
// depending on <param> values.
bool HTMLPlugInElement::allowedToLoadFrameURL(const String& url)
{
- KURL completeURL = document().completeURL(url);
+ KURL completeURL = treeScope().completeURL(url);
if (contentFrame() && protocolIsJavaScript(completeURL)
&& !document().securityOrigin()->canAccess(contentDocument()->securityOrigin()))
return false;
@@ -395,7 +395,7 @@ bool HTMLPlugInElement::wouldLoadAsNetscapePlugin(const String& url, const Strin
ASSERT(document().frame());
KURL completedURL;
if (!url.isEmpty())
- completedURL = document().completeURL(url);
+ completedURL = treeScope().completeURL(url);
return document().frame()->loader().client()->objectContentType(completedURL, serviceType, shouldPreferPlugInsForImages()) == ObjectContentNetscapePlugin;
}
@@ -410,7 +410,7 @@ bool HTMLPlugInElement::requestObject(const String& url, const String& mimeType,
if (!renderer)
return false;
- KURL completedURL = document().completeURL(url);
+ KURL completedURL = treeScope().completeURL(url);
if (!pluginIsLoadable(completedURL, mimeType))
return false;
« no previous file with comments | « Source/core/html/HTMLObjectElement.cpp ('k') | Source/core/html/HTMLScriptElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698