Changeset 28110 in webkit for trunk/JavaScriptCore/kjs/object.cpp

Timestamp:

Nov 28, 2007, 5:12:03 AM (18 years ago)

Author:

[email protected]

Message:

Roll out r28106 and r28108. These introduced a frequent assertion failure on page load and broke all non-Mac builds.

File:

• trunk/JavaScriptCore/kjs/object.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/object.cpp

@@ -114 +114 @@
 // ------------------------------ JSObject ------------------------------------
 
-void JSObject::markChildren(MarkStack& stack)
-{
+void JSObject::mark()
+{
+  JSCell::mark();
+
 #if JAVASCRIPT_MARK_TRACING
   static int markStackDepth = 0;
@@ -125 +127 @@
 #endif
   
-  stack.push(_proto);
-  _prop.markChildren(stack);
+  JSValue *proto = _proto;
+  if (!proto->marked())
+    proto->mark();
+
+  _prop.mark();
   
 #if JAVASCRIPT_MARK_TRACING