Changeset 23526 in webkit
- Timestamp:
- Jun 14, 2007 9:13:09 AM (17 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/JavaScriptCore/ChangeLog
r23521 r23526 1 2007-06-14 Anders Carlsson <andersca@apple.com> 2 3 Reviewed by Mitz. 4 5 <rdar://problem/5244948> 6 Safari keeps on complaining about slow script playing NBC TV video (14133) 7 8 http://bugs.webkit.org/show_bug.cgi?id=14133 9 Runaway JavaScript timer fires when spinning around in Google Maps street view 10 11 Make sure to start and stop the timeout checker around calls to JS. 12 13 * bindings/NP_jsobject.cpp: 14 (_NPN_InvokeDefault): 15 (_NPN_Invoke): 16 (_NPN_Evaluate): 17 * bindings/jni/jni_jsobject.cpp: 18 (JavaJSObject::call): 19 (JavaJSObject::eval): 20 1 21 2007-06-13 Darin Adler <darin@apple.com> 2 22 -
trunk/JavaScriptCore/bindings/NP_jsobject.cpp
r23512 r23526 125 125 126 126 List argList = listFromVariantArgs(exec, args, argCount, rootObject); 127 rootObject->interpreter()->startTimeoutCheck(); 127 128 JSValue *resultV = funcImp->call (exec, funcImp, argList); 128 129 rootObject->interpreter()->stopTimeoutCheck(); 130 129 131 // Convert and return the result of the function call. 130 132 convertValueToNPVariant(exec, resultV, result); … … 178 180 JSObject *thisObj = const_cast<JSObject*>(obj->imp); 179 181 List argList = listFromVariantArgs(exec, args, argCount, rootObject); 182 rootObject->interpreter()->startTimeoutCheck(); 180 183 JSValue *resultV = funcImp->call (exec, thisObj, argList); 184 rootObject->interpreter()->stopTimeoutCheck(); 181 185 182 186 // Convert and return the result of the function call. … … 210 214 unsigned int UTF16Length; 211 215 convertNPStringToUTF16(s, &scriptString, &UTF16Length); // requires free() of returned memory 216 rootObject->interpreter()->startTimeoutCheck(); 212 217 Completion completion = rootObject->interpreter()->evaluate(UString(), 0, UString((const UChar*)scriptString,UTF16Length)); 218 rootObject->interpreter()->stopTimeoutCheck(); 213 219 ComplType type = completion.complType(); 214 220 -
trunk/JavaScriptCore/bindings/jni/jni_jsobject.cpp
r22056 r23526 178 178 JSObject *thisObj = const_cast<JSObject*>(_imp); 179 179 List argList = listFromJArray(args); 180 rootObject->interpreter()->startTimeoutCheck(); 180 181 JSValue *result = funcImp->call(exec, thisObj, argList); 182 rootObject->interpreter()->stopTimeoutCheck(); 181 183 182 184 return convertValueToJObject(result); … … 196 198 return 0; 197 199 200 rootObject->interpreter()->startTimeoutCheck(); 198 201 Completion completion = rootObject->interpreter()->evaluate(UString(), 0, JavaString(script).ustring(),thisObj); 202 rootObject->interpreter()->stopTimeoutCheck(); 199 203 ComplType type = completion.complType(); 200 204 -
trunk/WebCore/ChangeLog
r23523 r23526 1 2007-06-14 Anders Carlsson <andersca@apple.com> 2 3 Reviewed by Mitz. 4 5 <rdar://problem/5244948> 6 Safari keeps on complaining about slow script playing NBC TV video (14133) 7 8 http://bugs.webkit.org/show_bug.cgi?id=14133 9 Runaway JavaScript timer fires when spinning around in Google Maps street view 10 11 Make sure to start and stop the timeout checker around calls to JS. 12 13 * bindings/objc/WebScriptObject.mm: 14 (-[WebScriptObject callWebScriptMethod:withArguments:]): 15 (-[WebScriptObject evaluateWebScript:]): 16 1 17 2007-06-14 George Staikos <staikos@kde.org> 2 18 -
trunk/WebCore/bindings/objc/WebScriptObject.mm
r23512 r23526 287 287 JSObject *thisObj = const_cast<JSObject*>([self _imp]); 288 288 List argList = listFromNSArray(exec, args, [self _rootObject]); 289 [self _rootObject]->interpreter()->startTimeoutCheck(); 289 290 JSValue *result = funcImp->call(exec, thisObj, argList); 291 [self _rootObject]->interpreter()->stopTimeoutCheck(); 290 292 291 293 if (exec->hadException()) { … … 318 320 319 321 JSValue *v = convertObjcValueToValue(exec, &script, ObjcObjectType, [self _rootObject]); 322 [self _rootObject]->interpreter()->startTimeoutCheck(); 320 323 Completion completion = [self _rootObject]->interpreter()->evaluate(UString(), 0, v->toString(exec)); 324 [self _rootObject]->interpreter()->stopTimeoutCheck(); 321 325 ComplType type = completion.complType(); 322 326
Note: See TracChangeset
for help on using the changeset viewer.