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 21 matching lines...) Expand all Loading... |
32 | 32 |
33 #include "bindings/core/v8/ExceptionState.h" | 33 #include "bindings/core/v8/ExceptionState.h" |
34 #include "bindings/core/v8/SerializedScriptValue.h" | 34 #include "bindings/core/v8/SerializedScriptValue.h" |
35 #include "bindings/core/v8/SerializedScriptValueFactory.h" | 35 #include "bindings/core/v8/SerializedScriptValueFactory.h" |
36 #include "public/platform/WebString.h" | 36 #include "public/platform/WebString.h" |
37 | 37 |
38 namespace blink { | 38 namespace blink { |
39 | 39 |
40 WebSerializedScriptValue WebSerializedScriptValue::fromString(const WebString& s
) | 40 WebSerializedScriptValue WebSerializedScriptValue::fromString(const WebString& s
) |
41 { | 41 { |
42 return SerializedScriptValueFactory::instance().createFromWire(s); | 42 return SerializedScriptValue::create(s); |
43 } | 43 } |
44 | 44 |
45 WebSerializedScriptValue WebSerializedScriptValue::serialize(v8::Local<v8::Value
> value) | 45 WebSerializedScriptValue WebSerializedScriptValue::serialize(v8::Local<v8::Value
> value) |
46 { | 46 { |
47 TrackExceptionState exceptionState; | 47 TrackExceptionState exceptionState; |
48 WebSerializedScriptValue serializedValue = SerializedScriptValueFactory::ins
tance().create(v8::Isolate::GetCurrent(), value, nullptr, exceptionState); | 48 WebSerializedScriptValue serializedValue = SerializedScriptValueFactory::ins
tance().create(v8::Isolate::GetCurrent(), value, nullptr, exceptionState); |
49 if (exceptionState.hadException()) | 49 if (exceptionState.hadException()) |
50 return createInvalid(); | 50 return createInvalid(); |
51 return serializedValue; | 51 return serializedValue; |
52 } | 52 } |
53 | 53 |
54 WebSerializedScriptValue WebSerializedScriptValue::createInvalid() | 54 WebSerializedScriptValue WebSerializedScriptValue::createInvalid() |
55 { | 55 { |
56 return SerializedScriptValueFactory::instance().create(); | 56 return SerializedScriptValue::create(); |
57 } | 57 } |
58 | 58 |
59 void WebSerializedScriptValue::reset() | 59 void WebSerializedScriptValue::reset() |
60 { | 60 { |
61 m_private.reset(); | 61 m_private.reset(); |
62 } | 62 } |
63 | 63 |
64 void WebSerializedScriptValue::assign(const WebSerializedScriptValue& other) | 64 void WebSerializedScriptValue::assign(const WebSerializedScriptValue& other) |
65 { | 65 { |
66 m_private = other.m_private; | 66 m_private = other.m_private; |
(...skipping 19 matching lines...) Expand all Loading... |
86 m_private = value; | 86 m_private = value; |
87 return *this; | 87 return *this; |
88 } | 88 } |
89 | 89 |
90 WebSerializedScriptValue::operator PassRefPtr<SerializedScriptValue>() const | 90 WebSerializedScriptValue::operator PassRefPtr<SerializedScriptValue>() const |
91 { | 91 { |
92 return m_private.get(); | 92 return m_private.get(); |
93 } | 93 } |
94 | 94 |
95 } // namespace blink | 95 } // namespace blink |
OLD | NEW |