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

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.h (modified) (4 diffs)

trunk/JavaScriptCore/kjs/object.h

@@ -28 +28 @@
 #include "JSType.h"
 #include "CommonIdentifiers.h"
-#include "MarkStack.h"
 #include "interpreter.h"
 #include "property_map.h"
@@ -86 +85 @@
     virtual JSObject *toObject(ExecState *exec) const;
       
-    virtual void markChildren(MarkStack&);
+    virtual void mark();
       
     JSObject *getGetter() { return getter; }
@@ -113 +112 @@
     JSObject();
 
-    virtual void markChildren(MarkStack&);
+    virtual void mark();
     virtual JSType type() const;
 
@@ -588 +587 @@
 // FIXME: Put this function in a separate file named something like scope_chain_mark.h -- can't put it in scope_chain.h since it depends on JSObject.
 
-inline void ScopeChain::markChildren(MarkStack& stack)
-{
-    for (ScopeChainNode* n = _node; n; n = n->next) {
-        JSObject* o = n->object;
-        stack.push(o);
+inline void ScopeChain::mark()
+{
+    for (ScopeChainNode *n = _node; n; n = n->next) {
+        JSObject *o = n->object;
+        if (!o->marked())
+            o->mark();
     }
 }