Changeset 138855 in webkit

Timestamp:

Jan 4, 2013, 2:18:28 PM (13 years ago)

Author:

abarth@webkit.org

Message:

HTMLTreeBuilder should ASSERT that it is on the main thread before touching elements
​https://bugs.webkit.org/show_bug.cgi?id=106128

Reviewed by Eric Seidel.

Even if we move the HTML parser onto a background thread, we're likely
to keep fragment parsing on the main thread. These code paths touch
elements (which only exist on the main thread) but are only used during
fragment parsing. This patch adds ASSERTs to document that invariant.

• html/parser/HTMLTreeBuilder.cpp:

(WebCore::closestFormAncestor):
(WebCore::HTMLTreeBuilder::HTMLTreeBuilder):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/parser/HTMLTreeBuilder.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-04  Adam Barth  <abarth@webkit.org>
+
+        HTMLTreeBuilder should ASSERT that it is on the main thread before touching elements
+        https://bugs.webkit.org/show_bug.cgi?id=106128
+
+        Reviewed by Eric Seidel.
+
+        Even if we move the HTML parser onto a background thread, we're likely
+        to keep fragment parsing on the main thread. These code paths touch
+        elements (which only exist on the main thread) but are only used during
+        fragment parsing. This patch adds ASSERTs to document that invariant.
+
+        * html/parser/HTMLTreeBuilder.cpp:
+        (WebCore::closestFormAncestor):
+        (WebCore::HTMLTreeBuilder::HTMLTreeBuilder):
+
 2013-01-04  Zoltan Horvath  <zoltan@webkit.org>
 

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

@@ -53 +53 @@
 #include "XMLNSNames.h"
 #include "XMLNames.h"
+#include <wtf/MainThread.h>
 #include <wtf/unicode/CharacterNames.h>
 
@@ -142 +143 @@
 static HTMLFormElement* closestFormAncestor(Element* element)
 {
+    ASSERT(isMainThread());
     while (element) {
         if (element->hasTagName(formTag))
@@ -296 +298 @@
     , m_usePreHTML5ParserQuirks(usePreHTML5ParserQuirks)
 {
+    ASSERT(isMainThread());
     // FIXME: This assertion will become invalid if <http://webkit.org/b/60316> is fixed.
     ASSERT(contextElement);