Merge 100550

Source/WebCore/dom/Document.h

Index: Source/WebCore/dom/Document.h
===================================================================
--- Source/WebCore/dom/Document.h	(revision 100576)
+++ Source/WebCore/dom/Document.h	(working copy)
@@ -605,6 +605,8 @@
     void setURL(const KURL&);
 
     const KURL& baseURL() const { return m_baseURL; }
+    void setBaseURLOverride(const KURL&);
+    const KURL& baseURLOverride() const { return m_baseURLOverride; }
     const String& baseTarget() const { return m_baseTarget; }
     void processBaseElement();
 
@@ -1174,6 +1176,7 @@
     // Document URLs.
     KURL m_url; // Document.URL: The URL from which this document was retrieved.
     KURL m_baseURL; // Node.baseURI: The URL to use when resolving relative URLs.
+    KURL m_baseURLOverride; // An alternative base URL that takes precedence ove m_baseURL (but not m_baseElementURL).
     KURL m_baseElementURL; // The URL set by the <base> element.
     KURL m_cookieURL; // The URL to use for cookie access.
     KURL m_firstPartyForCookies; // The policy URL for third-party cookie blocking.