Changeset 14932 in webkit for trunk/JavaScriptCore/bindings/objc/WebScriptObject.mm

Timestamp:

Jun 20, 2006, 5:20:00 PM (19 years ago)

Author:

thatcher

Message:

Reviewed by Geoff.

Make sure we clear the exception before returning so
that future calls will not fail because of an earlier
exception state. Assert on entry that the WebScriptObject
is working with an ExecState that dose not have an exception.
Document that evaluateWebScript and callWebScriptMethod return
WebUndefined when an exception is thrown.

• bindings/objc/WebScriptObject.h:
• bindings/objc/WebScriptObject.mm: (-[WebScriptObject callWebScriptMethod:withArguments:]): (-[WebScriptObject evaluateWebScript:]): (-[WebScriptObject setValue:forKey:]): (-[WebScriptObject valueForKey:]): (-[WebScriptObject removeWebScriptKey:]): (-[WebScriptObject webScriptValueAtIndex:]): (-[WebScriptObject setWebScriptValueAtIndex:value:]):

File:

• trunk/JavaScriptCore/bindings/objc/WebScriptObject.mm (modified) (14 diffs)

trunk/JavaScriptCore/bindings/objc/WebScriptObject.mm

@@ -176 +176 @@
     // Lookup the function object.
     ExecState *exec = [self _executionContext]->interpreter()->globalExec();
+    ASSERT(!exec->hadException());
 
     JSLock lock;
@@ -197 +198 @@
         LOG_EXCEPTION (exec);
         result = jsUndefined();
+        exec->clearException();
     }
 
@@ -216 +218 @@
     
     ExecState *exec = [self _executionContext]->interpreter()->globalExec();
+    ASSERT(!exec->hadException());
+
     JSValue *result;
-    
     JSLock lock;
     
@@ -234 +237 @@
         LOG_EXCEPTION (exec);
         result = jsUndefined();
+        exec->clearException();
     }
     
@@ -252 +256 @@
 
     ExecState *exec = [self _executionContext]->interpreter()->globalExec();
+    ASSERT(!exec->hadException());
 
     JSLock lock;
@@ -259 +264 @@
     if (exec->hadException()) {
         LOG_EXCEPTION (exec);
+        exec->clearException();
     }
 
@@ -273 +279 @@
 
     ExecState *exec = [self _executionContext]->interpreter()->globalExec();
+    ASSERT(!exec->hadException());
 
     JSLock lock;
@@ -281 +288 @@
         LOG_EXCEPTION (exec);
         result = jsUndefined();
+        exec->clearException();
     }
 
@@ -301 +309 @@
 
     ExecState *exec = [self _executionContext]->interpreter()->globalExec();
+    ASSERT(!exec->hadException());
 
     JSLock lock;
@@ -308 +317 @@
     if (exec->hadException()) {
         LOG_EXCEPTION (exec);
+        exec->clearException();
     }
 
@@ -341 +351 @@
 
     ExecState *exec = [self _executionContext]->interpreter()->globalExec();
+    ASSERT(!exec->hadException());
+
     JSLock lock;
     JSValue *result = [self _imp]->get (exec, (unsigned)index);
@@ -347 +359 @@
         LOG_EXCEPTION (exec);
         result = jsUndefined();
+        exec->clearException();
     }
 
@@ -365 +378 @@
 
     ExecState *exec = [self _executionContext]->interpreter()->globalExec();
+    ASSERT(!exec->hadException());
+
     JSLock lock;
     [self _imp]->put (exec, (unsigned)index, (convertObjcValueToValue(exec, &value, ObjcObjectType)));
@@ -370 +385 @@
     if (exec->hadException()) {
         LOG_EXCEPTION (exec);
+        exec->clearException();
     }