Merge 67292 - 2010-09-11 Mihai Parparita <mihaip@chromium.org>...

WebCore/dom/Document.cpp

Index: WebCore/dom/Document.cpp
===================================================================
--- WebCore/dom/Document.cpp	(revision 67731)
+++ WebCore/dom/Document.cpp	(working copy)
@@ -351,7 +351,7 @@
     Document* m_document;
 };
 
-Document::Document(Frame* frame, const KURL& url, bool isXHTML, bool isHTML)
+Document::Document(Frame* frame, const KURL& url, bool isXHTML, bool isHTML, const KURL& baseURL)
     : ContainerNode(0)
     , m_compatibilityMode(NoQuirksMode)
     , m_compatibilityModeLocked(false)
@@ -420,6 +420,11 @@
     if (frame || !url.isEmpty())
         setURL(url);
 
+    // Setting of m_baseURL needs to happen after the setURL call, since that
+    // calls updateBaseURL, which would clobber the passed in value.
+    if (!baseURL.isNull())
+        m_baseURL = baseURL;
+
     m_axObjectCache = 0;
 
     m_markers = new DocumentMarkerController();