Changeset 149521 in webkit
- Timestamp:
- May 3, 2013 2:34:36 AM (11 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r149519 r149521 1 2013-05-03 Allan Sandfeld Jensen <allan.jensen@digia.com> 2 3 Crash when calling QWebFrame::evaluateJavaScript 4 https://bugs.webkit.org/show_bug.cgi?id=113434 5 6 Reviewed by Simon Hausmann. 7 8 We must take the JS API lock before accessing internal JS methods. 9 10 * bridge/qt/qt_runtime.cpp: 11 (JSC::Bindings::unwrapBoxedPrimitive): 12 (JSC::Bindings::getGregorianDateTimeUTC): 13 (JSC::Bindings::convertQVariantToValue): 14 1 15 2013-05-02 Xan Lopez <xlopez@igalia.com> 2 16 -
trunk/Source/WebCore/bridge/qt/qt_runtime.cpp
r142810 r149521 22 22 23 23 #include "APICast.h" 24 #include "APIShims.h" 24 25 #include "BooleanObject.h" 25 26 #include "DateInstance.h" … … 200 201 static JSValueRef unwrapBoxedPrimitive(JSContextRef context, JSValueRef value, JSObjectRef obj) 201 202 { 203 ExecState* exec = toJS(context); 204 APIEntryShim entryShim(exec); 202 205 JSObject* object = toJS(obj); 203 ExecState* exec = toJS(context);204 206 if (object->inherits(&NumberObject::s_info)) 205 207 return toRef(exec, jsNumber(object->toNumber(exec))); … … 282 284 { 283 285 ExecState* exec = toJS(context); 286 APIEntryShim entryShim(exec); 284 287 if (type == Date) { 285 288 JSObject* jsObject = toJS(object); … … 730 733 memcpy(wtfByteArray->data(), qtByteArray.constData(), qtByteArray.length()); 731 734 ExecState* exec = toJS(context); 735 APIEntryShim entryShim(exec); 732 736 return toRef(exec, toJS(exec, static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), wtfByteArray.get())); 733 737 } … … 738 742 return JSValueMakeNull(context); 739 743 ExecState* exec = toJS(context); 744 APIEntryShim entryShim(exec); 740 745 return toRef(exec, QtInstance::getQtInstance(obj, root, QtInstance::QtOwnership)->createRuntimeObject(exec)); 741 746 } … … 752 757 return JSValueMakeUndefined(context); 753 758 ExecState* exec = toJS(context); 759 APIEntryShim entryShim(exec); 754 760 return toRef(exec, customRuntimeConversions()->value(type).toJSValueFunc(exec, toJSDOMGlobalObject(document, exec), variant)); 755 761 } … … 801 807 JSObjectRef array = JSObjectMakeArray(context, 0, 0, exception); 802 808 ExecState* exec = toJS(context); 809 APIEntryShim entryShim(exec); 803 810 for (int i = 0; i < ol.count(); ++i) { 804 811 JSValueRef jsObject = toRef(exec, QtInstance::getQtInstance(ol.at(i), root, QtInstance::QtOwnership)->createRuntimeObject(exec));
Note: See TracChangeset
for help on using the changeset viewer.