Changeset 77053 in webkit

Timestamp:

Jan 29, 2011 12:23:45 AM (13 years ago)

Author:

rniwa@webkit.org

Message:

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

Unreviewed, rolling out r77050.
​http://trac.webkit.org/changeset/77050
​https://bugs.webkit.org/show_bug.cgi?id=53371

Caused a crash in Chromium's test_shell_tests (Requested by
rniwa on #webkit).

• resources/performance-test.js: Removed.
• tiny-innerHTML.html: Removed.

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

Unreviewed, rolling out r77050.
​http://trac.webkit.org/changeset/77050
​https://bugs.webkit.org/show_bug.cgi?id=53371

Caused a crash in Chromium's test_shell_tests (Requested by
rniwa on #webkit).

• html/parser/HTMLTreeBuilder.cpp: (WebCore::HTMLTreeBuilder::FragmentParsingContext::FragmentParsingContext): (WebCore::HTMLTreeBuilder::FragmentParsingContext::document): (WebCore::HTMLTreeBuilder::FragmentParsingContext::finished):
• html/parser/HTMLTreeBuilder.h:

Location:

trunk

Files:

• PerformanceTests/Parser/ChangeLog (modified) (1 diff)
• PerformanceTests/Parser/resources/performance-test.js (deleted)
• PerformanceTests/Parser/tiny-innerHTML.html (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/parser/HTMLTreeBuilder.cpp (modified) (5 diffs)
• Source/WebCore/html/parser/HTMLTreeBuilder.h (modified) (1 diff)

trunk/PerformanceTests/Parser/ChangeLog

@@ +1 @@
+2011-01-29  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r77050.
+        http://trac.webkit.org/changeset/77050
+        https://bugs.webkit.org/show_bug.cgi?id=53371
+
+        Caused a crash in Chromium's test_shell_tests (Requested by
+        rniwa on #webkit).
+
+        * resources/performance-test.js: Removed.
+        * tiny-innerHTML.html: Removed.
+
 2011-01-28  Eric Seidel  <eric@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-29  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r77050.
+        http://trac.webkit.org/changeset/77050
+        https://bugs.webkit.org/show_bug.cgi?id=53371
+
+        Caused a crash in Chromium's test_shell_tests (Requested by
+        rniwa on #webkit).
+
+        * html/parser/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::FragmentParsingContext::FragmentParsingContext):
+        (WebCore::HTMLTreeBuilder::FragmentParsingContext::document):
+        (WebCore::HTMLTreeBuilder::FragmentParsingContext::finished):
+        * html/parser/HTMLTreeBuilder.h:
+
 2011-01-28  Eric Seidel  <eric@webkit.org>
 

trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp

@@ -396 +396 @@
 }
 
-// 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)
@@ -448 +404 @@
 
 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)
@@ -454 +410 @@
 {
     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());
 }
 
@@ -462 +415 @@
 {
     ASSERT(m_fragment);
-    return m_dummyDocumentForFragmentParsing;
+    return m_dummyDocumentForFragmentParsing.get();
 }
 
@@ -468 +421 @@
 {
     // 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);
-    ASSERT(!m_dummyDocumentForFragmentParsing->hasChildNodes());
-    DummyDocumentFactory::releaseDocument(m_dummyDocumentForFragmentParsing);
-    m_dummyDocumentForFragmentParsing = 0;
 }
 

trunk/Source/WebCore/html/parser/HTMLTreeBuilder.h

@@ -221 +221 @@
 
     private:
-        // Use a shared dummy document to avoid expensive Document creation.
-        // Hold a raw pointer to the document since there is no need to ref it.
-        HTMLDocument* m_dummyDocumentForFragmentParsing;
+        RefPtr<Document> m_dummyDocumentForFragmentParsing;
         DocumentFragment* m_fragment;
         Element* m_contextElement;