| OLD | NEW |
| 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 v8::Handle<v8::Value> result; | 49 v8::Handle<v8::Value> result; |
| 50 switch (event->dataType()) { | 50 switch (event->dataType()) { |
| 51 case MessageEvent::DataTypeScriptValue: { | 51 case MessageEvent::DataTypeScriptValue: { |
| 52 result = V8HiddenValue::getHiddenValue(info.GetIsolate(), info.Holder(),
V8HiddenValue::data(info.GetIsolate())); | 52 result = V8HiddenValue::getHiddenValue(info.GetIsolate(), info.Holder(),
V8HiddenValue::data(info.GetIsolate())); |
| 53 if (result.IsEmpty()) { | 53 if (result.IsEmpty()) { |
| 54 if (!event->dataAsSerializedScriptValue()) { | 54 if (!event->dataAsSerializedScriptValue()) { |
| 55 // If we're in an isolated world and the event was created in th
e main world, | 55 // 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. | 56 // 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())); | 57 v8::Local<v8::Value> mainWorldData = V8HiddenValue::getHiddenVal
ueFromMainWorldWrapper(info.GetIsolate(), event, V8HiddenValue::data(info.GetIso
late())); |
| 58 if (!mainWorldData.IsEmpty()) | 58 if (!mainWorldData.IsEmpty()) |
| 59 event->setSerializedData(SerializedScriptValue::createAndSwa
llowExceptions(mainWorldData, info.GetIsolate())); | 59 event->setSerializedData(SerializedScriptValue::createAndSwa
llowExceptions(info.GetIsolate(), mainWorldData)); |
| 60 } | 60 } |
| 61 if (event->dataAsSerializedScriptValue()) | 61 if (event->dataAsSerializedScriptValue()) |
| 62 result = event->dataAsSerializedScriptValue()->deserialize(info.
GetIsolate()); | 62 result = event->dataAsSerializedScriptValue()->deserialize(info.
GetIsolate()); |
| 63 else | 63 else |
| 64 result = v8::Null(info.GetIsolate()); | 64 result = v8::Null(info.GetIsolate()); |
| 65 } | 65 } |
| 66 break; | 66 break; |
| 67 } | 67 } |
| 68 | 68 |
| 69 case MessageEvent::DataTypeSerializedScriptValue: | 69 case MessageEvent::DataTypeSerializedScriptValue: |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 portArray = adoptPtrWillBeNoop(new MessagePortArray); | 119 portArray = adoptPtrWillBeNoop(new MessagePortArray); |
| 120 *portArray = toRefPtrWillBeMemberNativeArray<MessagePort, V8MessagePort>
(info[portArrayIndex], portArrayIndex + 1, info.GetIsolate(), exceptionState); | 120 *portArray = toRefPtrWillBeMemberNativeArray<MessagePort, V8MessagePort>
(info[portArrayIndex], portArrayIndex + 1, info.GetIsolate(), exceptionState); |
| 121 if (exceptionState.throwIfNeeded()) | 121 if (exceptionState.throwIfNeeded()) |
| 122 return; | 122 return; |
| 123 } | 123 } |
| 124 event->initMessageEvent(typeArg, canBubbleArg, cancelableArg, originArg, las
tEventIdArg, sourceArg, portArray.release()); | 124 event->initMessageEvent(typeArg, canBubbleArg, cancelableArg, originArg, las
tEventIdArg, sourceArg, portArray.release()); |
| 125 | 125 |
| 126 if (!dataArg.IsEmpty()) { | 126 if (!dataArg.IsEmpty()) { |
| 127 V8HiddenValue::setHiddenValue(info.GetIsolate(), info.Holder(), V8Hidden
Value::data(info.GetIsolate()), dataArg); | 127 V8HiddenValue::setHiddenValue(info.GetIsolate(), info.Holder(), V8Hidden
Value::data(info.GetIsolate()), dataArg); |
| 128 if (DOMWrapperWorld::current(info.GetIsolate()).isIsolatedWorld()) | 128 if (DOMWrapperWorld::current(info.GetIsolate()).isIsolatedWorld()) |
| 129 event->setSerializedData(SerializedScriptValue::createAndSwallowExce
ptions(dataArg, info.GetIsolate())); | 129 event->setSerializedData(SerializedScriptValue::createAndSwallowExce
ptions(info.GetIsolate(), dataArg)); |
| 130 } | 130 } |
| 131 } | 131 } |
| 132 | 132 |
| 133 } // namespace blink | 133 } // namespace blink |
| OLD | NEW |