2011-01-29 Sheriff Bot <webkit.review.bot@gmail.com>

[WebKit.git] / Source / WebCore / html / parser / HTMLTreeBuilder.cpp

diff --git a/Source/WebCore/html/parser/HTMLTreeBuilder.cpp b/Source/WebCore/html/parser/HTMLTreeBuilder.cpp
index 6b58afaea265f41d08d7f6590d700582b92143a7..97cee13ab2fed9fac1ab9ea584926b1e8c3be167 100644 (file)
--- a/Source/WebCore/html/parser/HTMLTreeBuilder.cpp
+++ b/Source/WebCore/html/parser/HTMLTreeBuilder.cpp
@@ -395,50 +395,6 @@ void HTMLTreeBuilder::detach()
     m_tree.detach();
 }
 
     m_tree.detach();
 }
 

-// NOTE: HTML5 requires that we use a dummy document when parsing
-// document fragments.  However, creating a new Document element
-// for each fragment is very slow (Document() does too much work, and
-// innerHTML is a common call).  So we use a shared dummy document.
-// This sharing works because there can only ever be one fragment
-// parser at any time.  Fragment parsing is synchronous and done
-// only from the main thread.  It should be impossible for javascript
-// (or anything else) to ever hold a reference to the dummy document.
-// See https://bugs.webkit.org/show_bug.cgi?id=48719
-class DummyDocumentFactory {
-    WTF_MAKE_NONCOPYABLE(DummyDocumentFactory); WTF_MAKE_FAST_ALLOCATED;
-public:
-    // Use an explicit create/release here to ASSERT this sharing is safe.
-    static HTMLDocument* createDummyDocument();
-    static void releaseDocument(HTMLDocument*);
-
-private:
-    static HTMLDocument* s_sharedDummyDocument;
-    static int s_sharedDummyDocumentMutex;
-};
-
-HTMLDocument* DummyDocumentFactory::createDummyDocument()
-{
-    if (!s_sharedDummyDocument) {
-        s_sharedDummyDocument = HTMLDocument::create(0, KURL()).releaseRef();
-        s_sharedDummyDocumentMutex = 0;
-    }
-    ASSERT(!s_sharedDummyDocumentMutex);
-    ASSERT(!s_sharedDummyDocument->hasChildNodes());
-    s_sharedDummyDocumentMutex++;
-    return s_sharedDummyDocument;
-}
-
-void DummyDocumentFactory::releaseDocument(HTMLDocument* dummyDocument)
-{
-    ASSERT(s_sharedDummyDocument == dummyDocument);
-    s_sharedDummyDocumentMutex--;
-    ASSERT(!s_sharedDummyDocumentMutex);
-    dummyDocument->removeAllChildren();
-}
-
-HTMLDocument* DummyDocumentFactory::s_sharedDummyDocument = 0;
-int DummyDocumentFactory::s_sharedDummyDocumentMutex = 0;
-

 HTMLTreeBuilder::FragmentParsingContext::FragmentParsingContext()
     : m_fragment(0)
     , m_contextElement(0)
 HTMLTreeBuilder::FragmentParsingContext::FragmentParsingContext()
     : m_fragment(0)
     , m_contextElement(0)


@@ -447,33 +403,27 @@ HTMLTreeBuilder::FragmentParsingContext::FragmentParsingContext()
 }
 
 HTMLTreeBuilder::FragmentParsingContext::FragmentParsingContext(DocumentFragment* fragment, Element* contextElement, FragmentScriptingPermission scriptingPermission)
 }
 
 HTMLTreeBuilder::FragmentParsingContext::FragmentParsingContext(DocumentFragment* fragment, Element* contextElement, FragmentScriptingPermission scriptingPermission)

-    : m_dummyDocumentForFragmentParsing(DummyDocumentFactory::createDummyDocument())
+    : m_dummyDocumentForFragmentParsing(HTMLDocument::create(0, KURL(), fragment->document()->baseURI()))

     , m_fragment(fragment)
     , m_contextElement(contextElement)
     , m_scriptingPermission(scriptingPermission)
 {
     m_dummyDocumentForFragmentParsing->setCompatibilityMode(fragment->document()->compatibilityMode());
     , m_fragment(fragment)
     , m_contextElement(contextElement)
     , m_scriptingPermission(scriptingPermission)
 {
     m_dummyDocumentForFragmentParsing->setCompatibilityMode(fragment->document()->compatibilityMode());

-    // Setting the baseURL should work the same as it would have had we passed
-    // it during HTMLDocument() construction, since the new document is empty.
-    m_dummyDocumentForFragmentParsing->setURL(fragment->document()->baseURI());

 }
 
 Document* HTMLTreeBuilder::FragmentParsingContext::document() const
 {
     ASSERT(m_fragment);
 }
 
 Document* HTMLTreeBuilder::FragmentParsingContext::document() const
 {
     ASSERT(m_fragment);

-    return m_dummyDocumentForFragmentParsing;
+    return m_dummyDocumentForFragmentParsing.get();

 }
 
 void HTMLTreeBuilder::FragmentParsingContext::finished()
 {
     // Populate the DocumentFragment with the parsed content now that we're done.
 }
 
 void HTMLTreeBuilder::FragmentParsingContext::finished()
 {
     // Populate the DocumentFragment with the parsed content now that we're done.

-    ContainerNode* root = m_dummyDocumentForFragmentParsing;
+    ContainerNode* root = m_dummyDocumentForFragmentParsing.get();

     if (m_contextElement)
         root = m_dummyDocumentForFragmentParsing->documentElement();
     m_fragment->takeAllChildrenFrom(root);
     if (m_contextElement)
         root = m_dummyDocumentForFragmentParsing->documentElement();
     m_fragment->takeAllChildrenFrom(root);

-    ASSERT(!m_dummyDocumentForFragmentParsing->hasChildNodes());
-    DummyDocumentFactory::releaseDocument(m_dummyDocumentForFragmentParsing);
-    m_dummyDocumentForFragmentParsing = 0;

 }
 
 HTMLTreeBuilder::FragmentParsingContext::~FragmentParsingContext()
 }
 
 HTMLTreeBuilder::FragmentParsingContext::~FragmentParsingContext()