Changeset 83668 in webkit

Timestamp:

Apr 12, 2011, 5:13:11 PM (14 years ago)

Author:

Stephanie Lewis

Message:

​https://bugs.webkit.org/show_bug.cgi?id=58280
Fix a layout test by correctly comparing enums, and not adding exceptions.

Reviewed by Oliver Hunt.

• bindings/js/SerializedScriptValue.cpp:

(WebCore::SerializedScriptValue::create):
(WebCore::SerializedScriptValue::deserialize):

• bindings/js/SerializedScriptValue.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/SerializedScriptValue.cpp (modified) (3 diffs)
• bindings/js/SerializedScriptValue.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-12  Stephanie Lewis  <slewis@apple.com>
+
+        Reviewed by Oliver Hunt.
+        https://bugs.webkit.org/show_bug.cgi?id=58280
+        Fix a layout test by correctly comparing enums, and not adding exceptions.
+
+        * bindings/js/SerializedScriptValue.cpp:
+        (WebCore::SerializedScriptValue::create):
+        (WebCore::SerializedScriptValue::deserialize):
+        * bindings/js/SerializedScriptValue.h:
+
 2011-04-12  Eric Carlson  <eric.carlson@apple.com>
 

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

@@ -1343 +1343 @@
     Vector<uint8_t> buffer;
     SerializationReturnCode code = CloneSerializer::serialize(exec, value, buffer);
-    if (throwExceptions)
+    if (throwExceptions == Throwing)
         maybeThrowExceptionIfSerializationFailed(exec, code);
 
@@ -1390 +1390 @@
 {
     DeserializationResult result = CloneDeserializer::deserialize(exec, globalObject, m_data);
-    if (throwExceptions)
+    if (throwExceptions == Throwing)
         maybeThrowExceptionIfSerializationFailed(exec, result.second);
     return result.first;
@@ -1432 +1432 @@
         break;
     case ExistingExceptionError:
-        throwError(exec, createTypeError(exec, "Javascript has thrown an exception.  Halting serialization."));
         break;
     case UnspecifiedError:
-        throwError(exec, createTypeError(exec, "Unknown error while serializing or deserializing data."));
         break;
     default:

trunk/Source/WebCore/bindings/js/SerializedScriptValue.h

@@ -48 +48 @@
 };
     
-enum SerializationErrorMode { Throwing, NonThrowing };
+enum SerializationErrorMode { NonThrowing, Throwing };
 
 class SharedBuffer;