Changeset 29438 in webkit for trunk/JavaScriptCore

Timestamp:

Jan 12, 2008, 7:43:03 AM (17 years ago)

Author:

[email protected]

Message:

Roll out r29435 as it introduces many, many crashes.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/JSGlobalObject.cpp (modified) (4 diffs)
• kjs/JSGlobalObject.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ -11 +11 @@
 
         * kjs/Activation.h:
-        * kjs/JSGlobalObject.h:
-
-2008-01-12  Cameron Zwarich  <[email protected]>
-
-        Reviewed by Mark Rowe.
-
-        Fixes leaking of ActivationStackNode objects.
-
-        * kjs/JSGlobalObject.cpp:
-        (KJS::JSGlobalObject::deleteActivationStack):
-        (KJS::JSGlobalObject::~JSGlobalObject):
-        (KJS::JSGlobalObject::init):
-        (KJS::JSGlobalObject::reset):
         * kjs/JSGlobalObject.h:
 

trunk/JavaScriptCore/kjs/JSGlobalObject.cpp

@@ -91 +91 @@
 JSGlobalObject* JSGlobalObject::s_head = 0;
 
-void JSGlobalObject::deleteActivationStack()
-{
-    for (ActivationStackNode* currentNode = d()->activations; currentNode; currentNode = currentNode->prev)
-        delete currentNode;
-}
-
 JSGlobalObject::~JSGlobalObject()
 {
@@ -109 +103 @@
     if (s_head == this)
         s_head = 0;
-    
-    deleteActivationStack();
     
     delete d();
@@ -136 +128 @@
     d()->recursion = 0;
     d()->debugger = 0;
-    
-    d()->activations = 0;
     
     reset(prototype());
@@ -213 +203 @@
     ExecState* exec = &d()->globalExec;
 
-    deleteActivationStack();
-    
-    ActivationStackNode* newStackNode = new ActivationStackNode;
-    newStackNode->prev = 0;    
-    d()->activations = newStackNode;
+    d()->activations = new ActivationStackNode;
     d()->activationCount = 0;
 

trunk/JavaScriptCore/kjs/JSGlobalObject.h

@@ -245 +245 @@
         void resetTimeoutCheck();
 
-        void deleteActivationStack();
         void checkActivationCount();