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

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

Issue 114363002: Structured cloning: improve DataCloneError reporting. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased + reset V8TestInterfaceConstructor.cpp result Created 7 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
« no previous file with comments | « Source/modules/indexeddb/IDBObjectStore.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
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 "WebSerializedScriptValue.h" 32 #include "WebSerializedScriptValue.h"
33 33
34 #include "bindings/v8/ExceptionState.h"
34 #include "bindings/v8/SerializedScriptValue.h" 35 #include "bindings/v8/SerializedScriptValue.h"
35 #include "public/platform/WebString.h" 36 #include "public/platform/WebString.h"
36 37
37 using namespace WebCore; 38 using namespace WebCore;
38 39
39 namespace blink { 40 namespace blink {
40 41
41 WebSerializedScriptValue WebSerializedScriptValue::fromString(const WebString& s ) 42 WebSerializedScriptValue WebSerializedScriptValue::fromString(const WebString& s )
42 { 43 {
43 return SerializedScriptValue::createFromWire(s); 44 return SerializedScriptValue::createFromWire(s);
44 } 45 }
45 46
46 WebSerializedScriptValue WebSerializedScriptValue::serialize(v8::Handle<v8::Valu e> value) 47 WebSerializedScriptValue WebSerializedScriptValue::serialize(v8::Handle<v8::Valu e> value)
47 { 48 {
48 bool didThrow; 49 WebCore::TrackExceptionState exceptionState;
49 WebSerializedScriptValue serializedValue = SerializedScriptValue::create(val ue, 0, 0, didThrow, v8::Isolate::GetCurrent()); 50 WebSerializedScriptValue serializedValue = SerializedScriptValue::create(val ue, 0, 0, exceptionState, v8::Isolate::GetCurrent());
50 if (didThrow) 51 if (exceptionState.hadException())
51 return createInvalid(); 52 return createInvalid();
52 return serializedValue; 53 return serializedValue;
53 } 54 }
54 55
55 WebSerializedScriptValue WebSerializedScriptValue::createInvalid() 56 WebSerializedScriptValue WebSerializedScriptValue::createInvalid()
56 { 57 {
57 return SerializedScriptValue::create(); 58 return SerializedScriptValue::create();
58 } 59 }
59 60
60 void WebSerializedScriptValue::reset() 61 void WebSerializedScriptValue::reset()
(...skipping 26 matching lines...) Expand all
87 m_private = value; 88 m_private = value;
88 return *this; 89 return *this;
89 } 90 }
90 91
91 WebSerializedScriptValue::operator PassRefPtr<SerializedScriptValue>() const 92 WebSerializedScriptValue::operator PassRefPtr<SerializedScriptValue>() const
92 { 93 {
93 return m_private.get(); 94 return m_private.get();
94 } 95 }
95 96
96 } // namespace blink 97 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/indexeddb/IDBObjectStore.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698