Changeset 147382 in webkit

Timestamp:

Apr 1, 2013 10:31:12 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[JSC] IndexedDB: Exceptions not thrown for non-cloneable values
​https://bugs.webkit.org/show_bug.cgi?id=113689

Patch by Michael Pruett <​michael@68k.org> on 2013-04-01
Reviewed by Kentaro Hara.

Source/WebCore:

ScriptValue::serialize() should not clear exceptions thrown during
serialization. This change is needed to match behavior in V8.

Tests: storage/indexeddb/clone-exception.html

storage/indexeddb/exceptions.html
storage/indexeddb/structured-clone.html

• bindings/js/ScriptValue.cpp:

(WebCore::ScriptValue::serialize):

LayoutTests:

• platform/gtk/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/ScriptValue.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-04-01  Michael Pruett  <michael@68k.org>
+
+        [JSC] IndexedDB: Exceptions not thrown for non-cloneable values
+        https://bugs.webkit.org/show_bug.cgi?id=113689
+
+        Reviewed by Kentaro Hara.
+
+        * platform/gtk/TestExpectations:
+
 2013-04-01  Shinya Kawanaka  <shinyak@chromium.org> 
 

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -1384 +1384 @@
 webkit.org/b/113127 media/track/track-prefer-captions.html [ Timeout ]
 
-webkit.org/b/113689 storage/indexeddb/clone-exception.html [ Failure ]
-webkit.org/b/113689 storage/indexeddb/exceptions.html [ Failure ]
-webkit.org/b/113689 storage/indexeddb/structured-clone.html [ Failure ]
-
 #////////////////////////////////////////////////////////////////////////////////////////
 # End of Tests failing

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-01  Michael Pruett  <michael@68k.org>
+
+        [JSC] IndexedDB: Exceptions not thrown for non-cloneable values
+        https://bugs.webkit.org/show_bug.cgi?id=113689
+
+        Reviewed by Kentaro Hara.
+
+        ScriptValue::serialize() should not clear exceptions thrown during
+        serialization. This change is needed to match behavior in V8.
+
+        Tests: storage/indexeddb/clone-exception.html
+               storage/indexeddb/exceptions.html
+               storage/indexeddb/structured-clone.html
+
+        * bindings/js/ScriptValue.cpp:
+        (WebCore::ScriptValue::serialize):
+
 2013-04-01  Joshua Bell  <jsbell@chromium.org>
 

trunk/Source/WebCore/bindings/js/ScriptValue.cpp

@@ -106 +106 @@
 PassRefPtr<SerializedScriptValue> ScriptValue::serialize(ScriptState* scriptState, MessagePortArray* messagePorts, ArrayBufferArray* arrayBuffers, bool& didThrow)
 {
-    JSValueRef exception = 0;
-    RefPtr<SerializedScriptValue> serializedValue = SerializedScriptValue::create(toRef(scriptState), toRef(scriptState, jsValue()), messagePorts, arrayBuffers, &exception);
-    didThrow = exception ? true : false;
+    RefPtr<SerializedScriptValue> serializedValue = SerializedScriptValue::create(scriptState, jsValue(), messagePorts, arrayBuffers);
+    didThrow = scriptState->hadException();
     return serializedValue.release();
 }