Changeset 25535 in webkit for trunk/JavaScriptCore/kjs/function.cpp

Timestamp:

Sep 13, 2007, 7:50:22 AM (18 years ago)

Author:

antti

Message:

JavaScriptCore:

Reviewed by Maciej.

Small addition to previous path to cover
​http://bugs.webkit.org/show_bug.cgi?id=11399
window.eval runs in the global scope of the calling window

Switch variable scope as well.

• kjs/function.cpp: (KJS::GlobalFuncImp::callAsFunction):

LayoutTests:

Reviewed by Maciej.

Change test case to cover
​http://bugs.webkit.org/show_bug.cgi?id=11399
too.

• fast/js/window-eval-context-expected.txt:
• fast/js/window-eval-context.html:

File:

• trunk/JavaScriptCore/kjs/function.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/function.cpp

@@ -834 +834 @@
         ctx.setExecState(&newExec);
           
-        if (switchGlobal)
+        if (switchGlobal) {
             ctx.pushScope(thisObj);
+            ctx.setVariableObject(thisObj);
+        }
         
         // execute the code