Changeset 2824 in webkit for trunk/JavaScriptCore/kjs/internal.cpp

Timestamp:

Nov 22, 2002, 1:04:55 AM (23 years ago)

Author:

darin

Message:

JavaScriptCore:

• change ScopeChain to be a singly linked list shares tails, gives 11% gain on iBench

• kjs/context.h: (ContextImp::pushScope): Make inline, use push instead of prepend, and pass imp pointer. (ContextImp::popScope): Make inline, use pop instead of removeFirst.
• kjs/function.cpp: (DeclaredFunctionImp::DeclaredFunctionImp): No need to copy.
• kjs/function_object.cpp: (FunctionObjectImp::construct): Use push instead of prepend, and pass imp pointer.
• kjs/internal.cpp: (ContextImp::ContextImp): Use clear, push instead of prepend, and pass imp pointers.
• kjs/nodes.cpp: (ResolveNode::evaluateReference): Use isEmpty, pop, and top instead of ScopeChainIterator.
• kjs/object.h: Change _scope to be a NoRefScopeChain.
• kjs/object.cpp: No need to initialize _scope any more, since it's not a NoRefScopeChain.

• kjs/scope_chain.h: Rewrite, different implementation and interface.
• kjs/scope_chain.cpp: More of the same.

WebCore:

• khtml/ecma/kjs_dom.cpp: (DOMNode::pushEventHandlerScope): Change to push handlers on an existing scope chain rather than returning one. Name change too.
• khtml/ecma/kjs_dom.h: More of the same.
• khtml/ecma/kjs_html.cpp: (KJS::HTMLElement::pushEventHandlerScope): And here.
• khtml/ecma/kjs_html.h: And here.

• khtml/ecma/kjs_events.cpp: (JSEventListener::handleEvent): Use the pushEventHandlerScope function, and also don't worry about optimizing the "no change" case, because that already works pretty efficiently.

File:

• trunk/JavaScriptCore/kjs/internal.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/internal.cpp

@@ -378 +378 @@
     case EvalCode:
       if (_callingContext) {
-        scope = _callingContext->scopeChain().copy();
+        scope = _callingContext->scopeChain();
         variable = _callingContext->variableObject();
         thisVal = _callingContext->thisValue();
@@ -384 +384 @@
       } // else same as GlobalCode
     case GlobalCode:
-      scope = ScopeChain();
-      scope.prepend(glob);
+      scope.clear();
+      scope.push(glob.imp());
       thisVal = Object(static_cast<ObjectImp*>(glob.imp()));
       break;
@@ -391 +391 @@
     case AnonymousCode:
       if (type == FunctionCode) {
-        scope = func->scope().copy();
-        scope.prepend(activation);
+        scope = func->scope();
+        scope.push(activation.imp());
       } else {
-        scope = ScopeChain();
-        scope.prepend(glob);
-        scope.prepend(activation);
+        scope.clear();
+        scope.push(glob.imp());
+        scope.push(activation.imp());
       }
       variable = activation; // TODO: DontDelete ? (ECMA 10.2.3)
@@ -409 +409 @@
 {
   _interpreter->setContext(_callingContext);
-}
-
-void ContextImp::pushScope(const Object &s)
-{
-  scope.prepend(s);
-}
-
-void ContextImp::popScope()
-{
-  scope.removeFirst();
 }