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

Source/core/html/HTMLFrameElementBase.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Simon Hausmann (hausmann@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved.
  *
  * 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 37 matching lines @@
     , m_marginWidth(-1)
     , m_marginHeight(-1)
 {
 }
 
 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();
         if (contentDoc && !ScriptController::canAccessFromCurrentOrigin(contentDoc->frame()))
             return false;
     }
 
     Frame* parentFrame = document().frame();
     if (parentFrame)
         return parentFrame->isURLAllowed(completeURL);
 
     return true;
 }
 
 void HTMLFrameElementBase::openURL(bool lockBackForwardList)
 {
     if (!isURLAllowed())
         return;
 
     if (m_URL.isEmpty())
         m_URL = AtomicString(blankURL().string());
 
     Frame* parentFrame = document().frame();
     if (!parentFrame)
         return;
 
     // 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();
     }
 
     if (!loadOrRedirectSubframe(url, m_frameName, lockBackForwardList))
         return;
     if (!contentFrame() || scriptURL.isEmpty())
         return;
     contentFrame()->script().executeScriptIfJavaScriptURL(scriptURL);
@@ skipping 68 matching lines @@
     if (RenderPart* part = renderPart()) {
         if (Frame* frame = contentFrame())
             part->setWidget(frame->view());
     }
 }
 
 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)
 {
     m_URL = AtomicString(str);
 
     if (inDocument())
         openURL(false);
 }
 
@@ skipping 34 matching lines @@
 
 int HTMLFrameElementBase::height()
 {
     document().updateLayoutIgnorePendingStylesheets();
     if (!renderBox())
         return 0;
     return renderBox()->height();
 }
 
 } // namespace WebCore