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

WebCore/dom/Document.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 333 matching lines @@
 private:
     DocumentWeakReference(Document* document)
         : m_document(document)
     {
         ASSERT(isMainThread());
     }
 
     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)
     , m_domTreeVersion(0)
     , m_styleSheets(StyleSheetList::create(this))
     , m_styleRecalcTimer(this, &Document::styleRecalcTimerFired)
     , m_pendingStyleRecalcShouldForce(false)
     , m_frameElementsShouldIgnoreScrolling(false)
     , m_containsValidityStyleRules(false)
     , m_updateFocusAppearanceRestoresSelection(false)
@@ skipping 48 matching lines @@
     m_printing = false;
     m_paginatedForScreen = false;
 
     m_ignoreAutofocus = false;
 
     m_frame = frame;
 
     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();
 
     m_docLoader = new DocLoader(this);
 
     m_visuallyOrdered = false;
     m_bParsing = false;
     m_wellFormed = false;
 
@@ skipping 4331 matching lines @@
 void Document::decrementLoadEventDelayCount()
 {
     ASSERT(m_loadEventDelayCount);
     --m_loadEventDelayCount;
 
     if (frame() && !m_loadEventDelayCount)
         frame()->loader()->checkCompleted();
 }
 
 } // namespace WebCore