Use TreeScope::completeURL and baseURL instead of the Document versions

Source/core/html/HTMLAppletElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Stefan Schimanski (1Stein@gmx.de)
  * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 109 matching lines @@
     LayoutUnit contentWidth = renderer->style()->width().isFixed() ? LayoutUnit(renderer->style()->width().value()) :
         renderer->width() - renderer->borderAndPaddingWidth();
     LayoutUnit contentHeight = renderer->style()->height().isFixed() ? LayoutUnit(renderer->style()->height().value()) :
         renderer->height() - renderer->borderAndPaddingHeight();
 
     Vector<String> paramNames;
     Vector<String> paramValues;
 
     const AtomicString& codeBase = getAttribute(codebaseAttr);
     if (!codeBase.isNull()) {
-        KURL codeBaseURL = document().completeURL(codeBase);
+        KURL codeBaseURL = treeScope().completeURL(codeBase);
         paramNames.append("codeBase");
         paramValues.append(codeBase.string());
     }
 
     const AtomicString& archive = getAttribute(archiveAttr);
     if (!archive.isNull()) {
         paramNames.append("archive");
         paramValues.append(archive.string());
     }
 
     const AtomicString& code = getAttribute(codeAttr);
     paramNames.append("code");
     paramValues.append(code.string());
 
     // If the 'codebase' attribute is set, it serves as a relative root for the file that the Java
     // plugin will load. If the 'code' attribute is set, and the 'archive' is not set, then we need
     // to check the url generated by resolving 'code' against 'codebase'. If the 'archive'
     // attribute is set, then 'code' points to a class inside the archive, so we need to check the
     // url generated by resolving 'archive' against 'codebase'.
     KURL urlToCheck;
-    KURL rootURL = codeBase.isNull() ? document().url() : document().completeURL(codeBase);
+    KURL rootURL = codeBase.isNull() ? document().url() : treeScope().completeURL(codeBase);
     if (!archive.isNull())
         urlToCheck = KURL(rootURL, archive);
     else if (!code.isNull())
         urlToCheck = KURL(rootURL, code);
     if (!canEmbedURL(urlToCheck))
         return;
 
     const AtomicString& name = document().isHTMLDocument() ? getNameAttribute() : getIdAttribute();
     if (!name.isNull()) {
         paramNames.append("name");
         paramValues.append(name.string());
     }
 
     paramNames.append("baseURL");
-    KURL baseURL = document().baseURL();
+    KURL baseURL = treeScope().baseURL();
     paramValues.append(baseURL.string());
 
     const AtomicString& mayScript = getAttribute(mayscriptAttr);
     if (!mayScript.isNull()) {
         paramNames.append("mayScript");
         paramValues.append(mayScript.string());
     }
 
     for (Node* child = firstChild(); child; child = child->nextSibling()) {
         if (!child->hasTagName(paramTag))
@@ skipping 46 matching lines @@
 
     if (!document().contentSecurityPolicy()->allowObjectFromSource(url)
         || !document().contentSecurityPolicy()->allowPluginType(appletMimeType, appletMimeType, url)) {
         renderEmbeddedObject()->setPluginUnavailabilityReason(RenderEmbeddedObject::PluginBlockedByContentSecurityPolicy);
         return false;
     }
     return true;
 }
 
 }