[webkit-changes] cvs commit: JavaScriptCore/bindings/objc
WebScriptObject.mm
Adele
adele at opensource.apple.com
Tue Aug 2 09:39:23 PDT 2005
adele 05/08/02 09:39:23
Modified: . Tag: Safari-2-0-branch ChangeLog
bindings/objc Tag: Safari-2-0-branch WebScriptObject.mm
Log:
Merged from TOT to Safari-2-0-branch.
2005-06-30 Kevin Decker <kdecker at apple.com>
Reviewed by rjw.
fixed: <rdar://problem/4166838> failed assertion in`Interpreter::lockCount() > 0
no layout test added; this is in the bindings code.
* bindings/objc/WebScriptObject.mm:
(+[WebScriptObject _convertValueToObjcValue:KJS::originExecutionContext:Bindings::executionContext:Bindings::]): make sure to lock and unlock the interpreter around allocations.
Revision Changes Path
No revision
No revision
1.677.6.12 +15 -0 JavaScriptCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/JavaScriptCore/ChangeLog,v
retrieving revision 1.677.6.11
retrieving revision 1.677.6.12
diff -u -r1.677.6.11 -r1.677.6.12
--- ChangeLog 26 Jul 2005 00:56:55 -0000 1.677.6.11
+++ ChangeLog 2 Aug 2005 16:39:22 -0000 1.677.6.12
@@ -1,3 +1,18 @@
+2005-08-02 Adele Peterson <adele at apple.com>
+
+ Merged from TOT to Safari-2-0-branch.
+
+ 2005-06-30 Kevin Decker <kdecker at apple.com>
+
+ Reviewed by rjw.
+
+ fixed: <rdar://problem/4166838> failed assertion in`Interpreter::lockCount() > 0
+
+ no layout test added; this is in the bindings code.
+
+ * bindings/objc/WebScriptObject.mm:
+ (+[WebScriptObject _convertValueToObjcValue:KJS::originExecutionContext:Bindings::executionContext:Bindings::]): make sure to lock and unlock the interpreter around allocations.
+
=== JavaScriptCore-412.6 ===
2005-07-21 Adele Peterson <adele at apple.com>
No revision
No revision
1.17.8.1 +5 -2 JavaScriptCore/bindings/objc/WebScriptObject.mm
Index: WebScriptObject.mm
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/objc/WebScriptObject.mm,v
retrieving revision 1.17
retrieving revision 1.17.8.1
diff -u -r1.17 -r1.17.8.1
--- WebScriptObject.mm 12 Feb 2005 00:58:13 -0000 1.17
+++ WebScriptObject.mm 2 Aug 2005 16:39:23 -0000 1.17.8.1
@@ -420,12 +420,15 @@
ObjectImp *objectImp = static_cast<ObjectImp*>(value.imp());
Interpreter *intepreter = executionContext->interpreter();
ExecState *exec = intepreter->globalExec();
-
- if (objectImp->classInfo() != &KJS::RuntimeObjectImp::info) {
+ Interpreter::lock();
+
+ if (objectImp->classInfo() != &KJS::RuntimeObjectImp::info) {
Value runtimeObject = objectImp->get(exec, "__apple_runtime_object");
if (!runtimeObject.isNull() && runtimeObject.type() == KJS::ObjectType)
objectImp = static_cast<RuntimeObjectImp*>(runtimeObject.imp());
}
+
+ Interpreter::unlock();
if (objectImp->classInfo() == &KJS::RuntimeObjectImp::info) {
RuntimeObjectImp *imp = static_cast<RuntimeObjectImp *>(objectImp);
More information about the webkit-changes
mailing list