Changeset 33312
- Timestamp:
- 05/12/08 23:02:49 (6 months ago)
- Location:
- branches/squirrelfish/WebCore
- Files:
-
- 5 modified
-
ChangeLog (modified) (1 diff)
-
bindings/js/kjs_proxy.cpp (modified) (1 diff)
-
bindings/objc/WebScriptObject.mm (modified) (1 diff)
-
bridge/NP_jsobject.cpp (modified) (1 diff)
-
bridge/jni/jni_jsobject.mm (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/squirrelfish/WebCore/ChangeLog
r33310 r33312 1 2008-04-30 Geoffrey Garen <ggaren@apple.com> 2 3 Build fix: supply a parameter that used to be implicit to 4 Interpreter::evaluate. 5 1 6 2008-04-30 Geoffrey Garen <ggaren@apple.com> 2 7 -
branches/squirrelfish/WebCore/bindings/js/kjs_proxy.cpp
r32844 r33312 86 86 87 87 m_windowShell->window()->startTimeoutCheck(); 88 Completion comp = Interpreter::evaluate(exec, filename, baseLine, str.characters(), str.length(), m_windowShell);88 Completion comp = Interpreter::evaluate(exec, exec->dynamicGlobalObject()->globalScopeChain(), filename, baseLine, str.characters(), str.length(), m_windowShell); 89 89 m_windowShell->window()->stopTimeoutCheck(); 90 90 -
branches/squirrelfish/WebCore/bindings/objc/WebScriptObject.mm
r33310 r33312 333 333 334 334 [self _rootObject]->globalObject()->startTimeoutCheck(); 335 Completion completion = Interpreter::evaluate([self _rootObject]->globalObject()->globalExec(), UString(), 0, String(script));335 Completion completion = Interpreter::evaluate([self _rootObject]->globalObject()->globalExec(), [self _rootObject]->globalObject()->globalScopeChain(), UString(), 0, String(script)); 336 336 [self _rootObject]->globalObject()->stopTimeoutCheck(); 337 337 ComplType type = completion.complType(); -
branches/squirrelfish/WebCore/bridge/NP_jsobject.cpp
r30897 r33312 197 197 String scriptString = convertNPStringToUTF16(s); 198 198 rootObject->globalObject()->startTimeoutCheck(); 199 Completion completion = Interpreter::evaluate(rootObject->globalObject()->globalExec(), UString(), 0, scriptString);199 Completion completion = Interpreter::evaluate(rootObject->globalObject()->globalExec(), rootObject->globalObject()->globalScopeChain(), UString(), 0, scriptString); 200 200 rootObject->globalObject()->stopTimeoutCheck(); 201 201 ComplType type = completion.complType(); -
branches/squirrelfish/WebCore/bridge/jni/jni_jsobject.mm
r33038 r33312 320 320 321 321 rootObject->globalObject()->startTimeoutCheck(); 322 Completion completion = Interpreter::evaluate(rootObject->globalObject()->globalExec(), UString(), 0, JavaString(script).ustring());322 Completion completion = Interpreter::evaluate(rootObject->globalObject()->globalExec(), rootObject->globalObject()->globalScopeChain(), UString(), 0, JavaString(script).ustring()); 323 323 rootObject->globalObject()->stopTimeoutCheck(); 324 324 ComplType type = completion.complType();