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