Changeset 127304 in webkit for trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp

Timestamp:

Aug 31, 2012, 1:10:09 PM (13 years ago)

Author:

[email protected]

Message:

Not reviewed.

Rolled out ​http://trac.webkit.org/changeset/127293 because it broke
inspector tests on Windows.

Shrink activation objects by half
​https://bugs.webkit.org/show_bug.cgi?id=95591

Reviewed by Sam Weinig.

File:

• trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp (modified) (9 diffs)

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp

@@ -31 +31 @@
 #include "JSGlobalObject.h"
 
+#include "JSCallbackConstructor.h"
+#include "JSCallbackFunction.h"
+#include "JSCallbackObject.h"
+
 #include "Arguments.h"
 #include "ArrayConstructor.h"
@@ -39 +43 @@
 #include "DateConstructor.h"
 #include "DatePrototype.h"
-#include "Debugger.h"
 #include "Error.h"
 #include "ErrorConstructor.h"
@@ -46 +49 @@
 #include "FunctionPrototype.h"
 #include "GetterSetter.h"
-#include "Interpreter.h"
-#include "JSActivation.h"
 #include "JSBoundFunction.h"
-#include "JSCallbackConstructor.h"
-#include "JSCallbackFunction.h"
-#include "JSCallbackObject.h"
 #include "JSFunction.h"
 #include "JSGlobalObjectFunctions.h"
 #include "JSLock.h"
-#include "JSNameScope.h"
 #include "JSONObject.h"
-#include "JSWithScope.h"
+#include "Interpreter.h"
 #include "Lookup.h"
 #include "MathObject.h"
@@ -74 +71 @@
 #include "RegExpObject.h"
 #include "RegExpPrototype.h"
-#include "StrictEvalActivation.h"
 #include "StringConstructor.h"
 #include "StringPrototype.h"
+#include "Debugger.h"
 
 #include "JSGlobalObject.lut.h"
@@ -110 +107 @@
 
 JSGlobalObject::JSGlobalObject(JSGlobalData& globalData, Structure* structure, const GlobalObjectMethodTable* globalObjectMethodTable)
-    : Base(globalData, structure, 0)
+    : Base(globalData, structure, this, this, 0)
     , m_masqueradesAsUndefinedWatchpoint(adoptRef(new WatchpointSet(InitializedWatching)))
     , m_weakRandom(Options::forceWeakRandomSeed() ? Options::forcedWeakRandomSeed() : static_cast<unsigned>(randomNumber() * (std::numeric_limits<unsigned>::max() + 1.0)))
@@ -130 +127 @@
 {
     static_cast<JSGlobalObject*>(cell)->JSGlobalObject::~JSGlobalObject();
-}
-
-void JSGlobalObject::setGlobalThis(JSGlobalData& globalData, JSObject* globalThis)
-{ 
-    m_globalThis.set(globalData, this, globalThis);
 }
 
@@ -217 +209 @@
     m_functionPrototype->structure()->setPrototypeWithoutTransition(exec->globalData(), m_objectPrototype.get());
 
-    m_nameScopeStructure.set(exec->globalData(), this, JSNameScope::createStructure(exec->globalData(), this, jsNull()));
-    m_activationStructure.set(exec->globalData(), this, JSActivation::createStructure(exec->globalData(), this, jsNull()));
-    m_strictEvalActivationStructure.set(exec->globalData(), this, StrictEvalActivation::createStructure(exec->globalData(), this, jsNull()));
-    m_withScopeStructure.set(exec->globalData(), this, JSWithScope::createStructure(exec->globalData(), this, jsNull()));
-
     m_emptyObjectStructure.set(exec->globalData(), this, m_objectPrototype->inheritorID(exec->globalData()));
     m_nullPrototypeObjectStructure.set(exec->globalData(), this, createEmptyObjectStructure(exec->globalData(), this, jsNull()));
@@ -358 +345 @@
     Base::visitChildren(thisObject, visitor);
 
-    visitor.append(&thisObject->m_globalThis);
     visitor.append(&thisObject->m_methodCallDummy);
 
@@ -385 +371 @@
     visitor.append(&thisObject->m_errorPrototype);
 
-    visitor.append(&thisObject->m_withScopeStructure);
-    visitor.append(&thisObject->m_strictEvalActivationStructure);
-    visitor.append(&thisObject->m_activationStructure);
-    visitor.append(&thisObject->m_nameScopeStructure);
     visitor.append(&thisObject->m_argumentsStructure);
     visitor.append(&thisObject->m_arrayStructure);