Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(364)

Side by Side Diff: Source/web/WebSerializedScriptValue.cpp

Issue 718383003: bindings: fixed incorrect dependency of SerializedScriptValue. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Added fast/js/structured-clone.html Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 15 matching lines...) Expand all
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
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 "bindings/core/v8/SerializedScriptValueFactory.h"
36 #include "public/platform/WebString.h" 37 #include "public/platform/WebString.h"
37 38
38 namespace blink { 39 namespace blink {
39 40
40 WebSerializedScriptValue WebSerializedScriptValue::fromString(const WebString& s ) 41 WebSerializedScriptValue WebSerializedScriptValue::fromString(const WebString& s )
41 { 42 {
42 return SerializedScriptValue::createFromWire(s); 43 return SerializedScriptValueFactory::instance().createFromWire(s);
43 } 44 }
44 45
45 WebSerializedScriptValue WebSerializedScriptValue::serialize(v8::Handle<v8::Valu e> value) 46 WebSerializedScriptValue WebSerializedScriptValue::serialize(v8::Handle<v8::Valu e> value)
46 { 47 {
47 TrackExceptionState exceptionState; 48 TrackExceptionState exceptionState;
48 WebSerializedScriptValue serializedValue = SerializedScriptValue::create(val ue, 0, 0, exceptionState, v8::Isolate::GetCurrent()); 49 WebSerializedScriptValue serializedValue = SerializedScriptValueFactory::ins tance().create(value, 0, 0, exceptionState, v8::Isolate::GetCurrent());
49 if (exceptionState.hadException()) 50 if (exceptionState.hadException())
50 return createInvalid(); 51 return createInvalid();
51 return serializedValue; 52 return serializedValue;
52 } 53 }
53 54
54 WebSerializedScriptValue WebSerializedScriptValue::createInvalid() 55 WebSerializedScriptValue WebSerializedScriptValue::createInvalid()
55 { 56 {
56 return SerializedScriptValue::create(); 57 return SerializedScriptValueFactory::instance().create();
57 } 58 }
58 59
59 void WebSerializedScriptValue::reset() 60 void WebSerializedScriptValue::reset()
60 { 61 {
61 m_private.reset(); 62 m_private.reset();
62 } 63 }
63 64
64 void WebSerializedScriptValue::assign(const WebSerializedScriptValue& other) 65 void WebSerializedScriptValue::assign(const WebSerializedScriptValue& other)
65 { 66 {
66 m_private = other.m_private; 67 m_private = other.m_private;
(...skipping 19 matching lines...) Expand all
86 m_private = value; 87 m_private = value;
87 return *this; 88 return *this;
88 } 89 }
89 90
90 WebSerializedScriptValue::operator PassRefPtr<SerializedScriptValue>() const 91 WebSerializedScriptValue::operator PassRefPtr<SerializedScriptValue>() const
91 { 92 {
92 return m_private.get(); 93 return m_private.get();
93 } 94 }
94 95
95 } // namespace blink 96 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/serviceworkers/ServiceWorkerContainer.cpp ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698