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

Side by Side Diff: Source/bindings/core/v8/custom/V8MessageEventCustom.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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 14 matching lines...) Expand all
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 "bindings/core/v8/V8MessageEvent.h" 32 #include "bindings/core/v8/V8MessageEvent.h"
33 33
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/V8ArrayBuffer.h" 36 #include "bindings/core/v8/V8ArrayBuffer.h"
36 #include "bindings/core/v8/V8Binding.h" 37 #include "bindings/core/v8/V8Binding.h"
37 #include "bindings/core/v8/V8Blob.h" 38 #include "bindings/core/v8/V8Blob.h"
38 #include "bindings/core/v8/V8HiddenValue.h" 39 #include "bindings/core/v8/V8HiddenValue.h"
39 #include "bindings/core/v8/V8MessagePort.h" 40 #include "bindings/core/v8/V8MessagePort.h"
40 #include "bindings/core/v8/V8Window.h" 41 #include "bindings/core/v8/V8Window.h"
41 #include "core/events/MessageEvent.h" 42 #include "core/events/MessageEvent.h"
42 43
43 namespace blink { 44 namespace blink {
44 45
45 void V8MessageEvent::dataAttributeGetterCustom(const v8::PropertyCallbackInfo<v8 ::Value>& info) 46 void V8MessageEvent::dataAttributeGetterCustom(const v8::PropertyCallbackInfo<v8 ::Value>& info)
46 { 47 {
47 MessageEvent* event = V8MessageEvent::toImpl(info.Holder()); 48 MessageEvent* event = V8MessageEvent::toImpl(info.Holder());
48 49
49 v8::Handle<v8::Value> result; 50 v8::Handle<v8::Value> result;
50 switch (event->dataType()) { 51 switch (event->dataType()) {
51 case MessageEvent::DataTypeScriptValue: { 52 case MessageEvent::DataTypeScriptValue: {
52 result = V8HiddenValue::getHiddenValue(info.GetIsolate(), info.Holder(), V8HiddenValue::data(info.GetIsolate())); 53 result = V8HiddenValue::getHiddenValue(info.GetIsolate(), info.Holder(), V8HiddenValue::data(info.GetIsolate()));
53 if (result.IsEmpty()) { 54 if (result.IsEmpty()) {
54 if (!event->dataAsSerializedScriptValue()) { 55 if (!event->dataAsSerializedScriptValue()) {
55 // If we're in an isolated world and the event was created in th e main world, 56 // If we're in an isolated world and the event was created in th e main world,
56 // we need to find the 'data' property on the main world wrapper and clone it. 57 // we need to find the 'data' property on the main world wrapper and clone it.
57 v8::Local<v8::Value> mainWorldData = V8HiddenValue::getHiddenVal ueFromMainWorldWrapper(info.GetIsolate(), event, V8HiddenValue::data(info.GetIso late())); 58 v8::Local<v8::Value> mainWorldData = V8HiddenValue::getHiddenVal ueFromMainWorldWrapper(info.GetIsolate(), event, V8HiddenValue::data(info.GetIso late()));
58 if (!mainWorldData.IsEmpty()) 59 if (!mainWorldData.IsEmpty())
59 event->setSerializedData(SerializedScriptValue::createAndSwa llowExceptions(info.GetIsolate(), mainWorldData)); 60 event->setSerializedData(SerializedScriptValueFactory::insta nce().createAndSwallowExceptions(info.GetIsolate(), mainWorldData));
60 } 61 }
61 if (event->dataAsSerializedScriptValue()) 62 if (event->dataAsSerializedScriptValue())
62 result = event->dataAsSerializedScriptValue()->deserialize(info. GetIsolate()); 63 result = event->dataAsSerializedScriptValue()->deserialize(info. GetIsolate());
63 else 64 else
64 result = v8::Null(info.GetIsolate()); 65 result = v8::Null(info.GetIsolate());
65 } 66 }
66 break; 67 break;
67 } 68 }
68 69
69 case MessageEvent::DataTypeSerializedScriptValue: 70 case MessageEvent::DataTypeSerializedScriptValue:
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 portArray = adoptPtrWillBeNoop(new MessagePortArray); 120 portArray = adoptPtrWillBeNoop(new MessagePortArray);
120 *portArray = toRefPtrWillBeMemberNativeArray<MessagePort, V8MessagePort> (info[portArrayIndex], portArrayIndex + 1, info.GetIsolate(), exceptionState); 121 *portArray = toRefPtrWillBeMemberNativeArray<MessagePort, V8MessagePort> (info[portArrayIndex], portArrayIndex + 1, info.GetIsolate(), exceptionState);
121 if (exceptionState.throwIfNeeded()) 122 if (exceptionState.throwIfNeeded())
122 return; 123 return;
123 } 124 }
124 event->initMessageEvent(typeArg, canBubbleArg, cancelableArg, originArg, las tEventIdArg, sourceArg, portArray.release()); 125 event->initMessageEvent(typeArg, canBubbleArg, cancelableArg, originArg, las tEventIdArg, sourceArg, portArray.release());
125 126
126 if (!dataArg.IsEmpty()) { 127 if (!dataArg.IsEmpty()) {
127 V8HiddenValue::setHiddenValue(info.GetIsolate(), info.Holder(), V8Hidden Value::data(info.GetIsolate()), dataArg); 128 V8HiddenValue::setHiddenValue(info.GetIsolate(), info.Holder(), V8Hidden Value::data(info.GetIsolate()), dataArg);
128 if (DOMWrapperWorld::current(info.GetIsolate()).isIsolatedWorld()) 129 if (DOMWrapperWorld::current(info.GetIsolate()).isIsolatedWorld())
129 event->setSerializedData(SerializedScriptValue::createAndSwallowExce ptions(info.GetIsolate(), dataArg)); 130 event->setSerializedData(SerializedScriptValueFactory::instance().cr eateAndSwallowExceptions(info.GetIsolate(), dataArg));
130 } 131 }
131 } 132 }
132 133
133 } // namespace blink 134 } // namespace blink
OLDNEW
« no previous file with comments | « Source/bindings/core/v8/custom/V8HistoryCustom.cpp ('k') | Source/bindings/core/v8/custom/V8PopStateEventCustom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698