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

WebCore/html/HTMLDocument.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2006, 2007, 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
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 17 matching lines @@
 #include <wtf/HashCountedSet.h>
 #include <wtf/text/AtomicStringHash.h>
 
 namespace WebCore {
 
 class FrameView;
 class HTMLElement;
 
 class HTMLDocument : public Document, public CachedResourceClient {
 public:
-    static PassRefPtr<HTMLDocument> create(Frame* frame, const KURL& url)
+    static PassRefPtr<HTMLDocument> create(Frame* frame, const KURL& url, const KURL& baseURL = KURL())
     {
-        return adoptRef(new HTMLDocument(frame, url));
+        return adoptRef(new HTMLDocument(frame, url, baseURL));
     }
     virtual ~HTMLDocument();
 
     int width();
     int height();
 
     String dir();
     void setDir(const String&);
 
     String designMode() const;
@@ skipping 23 matching lines @@
 
     void addNamedItem(const AtomicString& name);
     void removeNamedItem(const AtomicString& name);
     bool hasNamedItem(AtomicStringImpl* name);
 
     void addExtraNamedItem(const AtomicString& name);
     void removeExtraNamedItem(const AtomicString& name);
     bool hasExtraNamedItem(AtomicStringImpl* name);
 
 protected:
-    HTMLDocument(Frame*, const KURL&);
+    HTMLDocument(Frame* frame, const KURL& url, const KURL& baseURL = KURL());
 
 private:
     virtual PassRefPtr<Element> createElement(const AtomicString& tagName, ExceptionCode&);
 
     virtual bool isFrameSet() const;
     virtual PassRefPtr<DocumentParser> createParser();
 
     void addItemToMap(HashCountedSet<AtomicStringImpl*>&, const AtomicString&);
     void removeItemFromMap(HashCountedSet<AtomicStringImpl*>&, const AtomicString&);
 
     HashCountedSet<AtomicStringImpl*> m_namedItemCounts;
     HashCountedSet<AtomicStringImpl*> m_extraNamedItemCounts;
 };
 
 inline bool HTMLDocument::hasNamedItem(AtomicStringImpl* name)
 {
     ASSERT(name);
     return m_namedItemCounts.contains(name);
 }
 
 inline bool HTMLDocument::hasExtraNamedItem(AtomicStringImpl* name)
 {
     ASSERT(name);
     return m_extraNamedItemCounts.contains(name);
 }
 
 } // namespace WebCore
 
 #endif // HTMLDocument_h