Changeset 86810 in webkit

Timestamp:

May 18, 2011 6:15:52 PM (13 years ago)

Author:

oliver@apple.com

Message:

2011-05-18 Oliver Hunt <​oliver@apple.com>

Reviewed by Geoffrey Garen.

+[WebScriptObject throwException:] doesn't work when invoked from obj-c field access
​https://bugs.webkit.org/show_bug.cgi?id=61100

The objc bindings were written to assume exceptions would
come from obj-c style exceptions, rather than throwException:
This code simply calls the global ObjcInstance mechanism for
transferring the reported exception.

• bridge/objc/objc_instance.h:
• bridge/objc/objc_runtime.mm: (JSC::Bindings::ObjcField::valueFromInstance): (JSC::Bindings::ObjcField::setValueToInstance):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bridge/objc/objc_instance.h (modified) (1 diff)
• bridge/objc/objc_runtime.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-18  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Geoffrey Garen.
+
+        +[WebScriptObject throwException:] doesn't work when invoked from obj-c field access
+        https://bugs.webkit.org/show_bug.cgi?id=61100
+
+        The objc bindings were written to assume exceptions would
+        come from obj-c style exceptions, rather than throwException:
+        This code simply calls the global ObjcInstance mechanism for
+        transferring the reported exception.
+
+        * bridge/objc/objc_instance.h:
+        * bridge/objc/objc_runtime.mm:
+        (JSC::Bindings::ObjcField::valueFromInstance):
+        (JSC::Bindings::ObjcField::setValueToInstance):
+
 2011-05-16  Adrienne Walker  <enne@google.com>
 

trunk/Source/WebCore/bridge/objc/objc_instance.h

@@ -68 +68 @@
 
 private:
+    friend class ObjcField;
     static void moveGlobalExceptionToExecState(ExecState*);
 

trunk/Source/WebCore/bridge/objc/objc_runtime.mm

@@ -103 +103 @@
         if (id objcValue = [targetObject valueForKey:(NSString *)_name.get()])
             result = convertObjcValueToValue(exec, &objcValue, ObjcObjectType, instance->rootObject());
+        {
+            JSLock lock(SilenceAssertionsOnly);
+            ObjcInstance::moveGlobalExceptionToExecState(exec);
+        }
     } @catch(NSException* localException) {
         JSLock::lock(SilenceAssertionsOnly);
@@ -131 +135 @@
     @try {
         [targetObject setValue:value forKey:(NSString *)_name.get()];
+        {
+            JSLock lock(SilenceAssertionsOnly);
+            ObjcInstance::moveGlobalExceptionToExecState(exec);
+        }
     } @catch(NSException* localException) {
         JSLock::lock(SilenceAssertionsOnly);