Changeset 16117 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Aug 30, 2006, 11:45:07 AM (19 years ago)

Author:

ggaren

Message:

JavaScriptCore:

Reviewed, tweaked by ggaren.

• Added storage and accessor functions for ExecState as a fix for ​http://bugzilla.opendarwin.org/show_bug.cgi?id=10114

• kjs/ExecState.cpp: (KJS::ExecState::ExecState):
• kjs/ExecState.h:
• kjs/context.h: (KJS::Context::setExecState): (KJS::Context::execState):

LayoutTests:

Reviewed by ggaren.

• Updated test to check for exceptions thrown in a plug-in. This is a test for ​http://bugzilla.opendarwin.org/show_bug.cgi?id=10114.
• plugins/bindings-test-expected.txt:
• plugins/bindings-test.html:

WebCore:

Reviewed, tweaked by ggaren.

• Changed to use ExecState on current context rather than global. Part of the fix for ​http://bugzilla.opendarwin.org/show_bug.cgi?id=10114
• bindings/objc/WebScriptObject.mm: (+[WebScriptObject throwException:]): (-[WebScriptObject setException:]):

Location:

trunk/JavaScriptCore/kjs

Files:

• context.h (modified) (3 diffs)
• function.cpp (modified) (2 diffs)
• interpreter.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/context.h

@@ -30 +30 @@
 namespace KJS  {
 
+  class ExecState;
+  
   /** 
    * @short Execution context.
@@ -118 +120 @@
     void mark();
 
+    void setExecState(ExecState* exec) { m_execState = exec; }
+    ExecState* execState() { return m_execState; }
+
   private:
     // Contexts are always stack-allocated, and the garbage collector
@@ -125 +130 @@
     Context* m_callingContext;
     FunctionBodyNode* m_currentBody;
+    ExecState* m_execState;
 
     FunctionImp* m_function;

trunk/JavaScriptCore/kjs/function.cpp

@@ -83 +83 @@
   if (exec->hadException())
     newExec.setException(exec->exception());
+  ctx.setExecState(&newExec);
 
   // assign user supplied arguments to parameters
@@ -819 +820 @@
                        EvalCode,
                        exec->context());
-        
         ExecState newExec(exec->dynamicInterpreter(), &ctx);
         if (exec->hadException())
             newExec.setException(exec->exception());
+        ctx.setExecState(&newExec);
         
         // execute the code

trunk/JavaScriptCore/kjs/interpreter.cpp

@@ -471 +471 @@
         Context ctx(globalObj, this, thisObj, progNode.get());
         ExecState newExec(this, &ctx);
+        ctx.setExecState(&newExec);
         progNode->processVarDecls(&newExec);
         res = progNode->execute(&newExec);