| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "public/web/WebSerializedScriptValue.h" | 32 #include "public/web/WebSerializedScriptValue.h" |
| 33 | 33 |
| 34 #include "bindings/core/v8/ExceptionState.h" | 34 #include "bindings/core/v8/ExceptionState.h" |
| 35 #include "bindings/core/v8/SerializedScriptValue.h" | 35 #include "bindings/core/v8/SerializedScriptValue.h" |
| 36 #include "public/platform/WebString.h" | 36 #include "public/platform/WebString.h" |
| 37 | 37 |
| 38 using namespace WebCore; | 38 using namespace blink; |
| 39 | 39 |
| 40 namespace blink { | 40 namespace blink { |
| 41 | 41 |
| 42 WebSerializedScriptValue WebSerializedScriptValue::fromString(const WebString& s
) | 42 WebSerializedScriptValue WebSerializedScriptValue::fromString(const WebString& s
) |
| 43 { | 43 { |
| 44 return SerializedScriptValue::createFromWire(s); | 44 return SerializedScriptValue::createFromWire(s); |
| 45 } | 45 } |
| 46 | 46 |
| 47 WebSerializedScriptValue WebSerializedScriptValue::serialize(v8::Handle<v8::Valu
e> value) | 47 WebSerializedScriptValue WebSerializedScriptValue::serialize(v8::Handle<v8::Valu
e> value) |
| 48 { | 48 { |
| 49 WebCore::TrackExceptionState exceptionState; | 49 blink::TrackExceptionState exceptionState; |
| 50 WebSerializedScriptValue serializedValue = SerializedScriptValue::create(val
ue, 0, 0, exceptionState, v8::Isolate::GetCurrent()); | 50 WebSerializedScriptValue serializedValue = SerializedScriptValue::create(val
ue, 0, 0, exceptionState, v8::Isolate::GetCurrent()); |
| 51 if (exceptionState.hadException()) | 51 if (exceptionState.hadException()) |
| 52 return createInvalid(); | 52 return createInvalid(); |
| 53 return serializedValue; | 53 return serializedValue; |
| 54 } | 54 } |
| 55 | 55 |
| 56 WebSerializedScriptValue WebSerializedScriptValue::createInvalid() | 56 WebSerializedScriptValue WebSerializedScriptValue::createInvalid() |
| 57 { | 57 { |
| 58 return SerializedScriptValue::create(); | 58 return SerializedScriptValue::create(); |
| 59 } | 59 } |
| (...skipping 28 matching lines...) Expand all Loading... |
| 88 m_private = value; | 88 m_private = value; |
| 89 return *this; | 89 return *this; |
| 90 } | 90 } |
| 91 | 91 |
| 92 WebSerializedScriptValue::operator PassRefPtr<SerializedScriptValue>() const | 92 WebSerializedScriptValue::operator PassRefPtr<SerializedScriptValue>() const |
| 93 { | 93 { |
| 94 return m_private.get(); | 94 return m_private.get(); |
| 95 } | 95 } |
| 96 | 96 |
| 97 } // namespace blink | 97 } // namespace blink |
| OLD | NEW |