Changeset 20019 for trunk/WebCore/dom/Node.h

Timestamp:

03/07/07 07:37:06 (22 months ago)

Author:

ggaren

Message:

JavaScriptCore:

Reviewed by Maciej.

http://bugs.webkit.org/show_bug.cgi?id=12997

Wrap pthread-specific assertion in #if USE(MULTIPLE_THREADS).

• kjs/collector.cpp: (KJS::Collector::markMainThreadOnlyObjects):

WebCore:

Reviewed by Maciej Stachowiak.

Fixed <rdar://problem/4576242> | http://bugs.webkit.org/show_bug.cgi?id=12586
PAC file: malloc deadlock sometimes causes a hang @ www.apple.com/pro/profiles/ (12586)

No test because this is very difficult to repro, and the new ASSERTs in
JavaScriptCore catch the underlying cause while running normal layout tests.

This is a modified version of r14752 on the branch.

The fix is to use a bit inside each node, instead of a hash table, to track
which node subtrees are in the process of being marked. This avoids a call
to malloc inside mark().

• bindings/js/kjs_binding.cpp: (KJS::domObjects): (KJS::domNodesPerDocument):
• bindings/js/kjs_dom.cpp: (KJS::DOMNode::mark):
• dom/Node.cpp: (WebCore::Node::Node):
• dom/Node.h:

Files:

• trunk/WebCore/dom/Node.h (modified) (2 diffs)

trunk/WebCore/dom/Node.h

@@ -460 +460 @@
     short m_tabIndex;
 
+    // 16 bit fields exactly -- adding another field would increase the size of all Nodes
     bool m_hasId : 1;
     bool m_hasClass : 1;
@@ -478 +479 @@
     bool m_inDetach : 1;
 
+public:
+    bool m_inSubtreeMark : 1;
+
 private:
     Element* ancestorElement() const;