Changeset 83668 in webkit


Ignore:
Timestamp:
Apr 12, 2011 5:13:11 PM (13 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r83667 r83668  
     12011-04-12  Stephanie Lewis  <slewis@apple.com>
     2
     3        Reviewed by Oliver Hunt.
     4        https://bugs.webkit.org/show_bug.cgi?id=58280
     5        Fix a layout test by correctly comparing enums, and not adding exceptions.
     6
     7        * bindings/js/SerializedScriptValue.cpp:
     8        (WebCore::SerializedScriptValue::create):
     9        (WebCore::SerializedScriptValue::deserialize):
     10        * bindings/js/SerializedScriptValue.h:
     11
    1122011-04-12  Eric Carlson  <eric.carlson@apple.com>
    213
  • trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp

    r83645 r83668  
    13431343    Vector<uint8_t> buffer;
    13441344    SerializationReturnCode code = CloneSerializer::serialize(exec, value, buffer);
    1345     if (throwExceptions)
     1345    if (throwExceptions == Throwing)
    13461346        maybeThrowExceptionIfSerializationFailed(exec, code);
    13471347
     
    13901390{
    13911391    DeserializationResult result = CloneDeserializer::deserialize(exec, globalObject, m_data);
    1392     if (throwExceptions)
     1392    if (throwExceptions == Throwing)
    13931393        maybeThrowExceptionIfSerializationFailed(exec, result.second);
    13941394    return result.first;
     
    14321432        break;
    14331433    case ExistingExceptionError:
    1434         throwError(exec, createTypeError(exec, "Javascript has thrown an exception.  Halting serialization."));
    14351434        break;
    14361435    case UnspecifiedError:
    1437         throwError(exec, createTypeError(exec, "Unknown error while serializing or deserializing data."));
    14381436        break;
    14391437    default:
  • trunk/Source/WebCore/bindings/js/SerializedScriptValue.h

    r83645 r83668  
    4848};
    4949   
    50 enum SerializationErrorMode { Throwing, NonThrowing };
     50enum SerializationErrorMode { NonThrowing, Throwing };
    5151
    5252class SharedBuffer;
Note: See TracChangeset for help on using the changeset viewer.