| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 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 Loading... |
| 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/V8CustomEvent.h" | 32 #include "bindings/core/v8/V8CustomEvent.h" |
| 33 | 33 |
| 34 #include "bindings/core/v8/Dictionary.h" | 34 #include "bindings/core/v8/Dictionary.h" |
| 35 #include "bindings/core/v8/SerializedScriptValue.h" | 35 #include "bindings/core/v8/SerializedScriptValue.h" |
| 36 #include "bindings/core/v8/SerializedScriptValueFactory.h" |
| 36 #include "bindings/core/v8/V8Binding.h" | 37 #include "bindings/core/v8/V8Binding.h" |
| 37 #include "bindings/core/v8/V8DOMWrapper.h" | 38 #include "bindings/core/v8/V8DOMWrapper.h" |
| 38 #include "bindings/core/v8/V8Event.h" | 39 #include "bindings/core/v8/V8Event.h" |
| 39 #include "bindings/core/v8/V8HiddenValue.h" | 40 #include "bindings/core/v8/V8HiddenValue.h" |
| 40 #include "core/dom/ContextFeatures.h" | 41 #include "core/dom/ContextFeatures.h" |
| 41 #include "platform/RuntimeEnabledFeatures.h" | 42 #include "platform/RuntimeEnabledFeatures.h" |
| 42 | 43 |
| 43 namespace blink { | 44 namespace blink { |
| 44 | 45 |
| 45 static v8::Handle<v8::Value> cacheState(v8::Handle<v8::Object> customEvent, v8::
Handle<v8::Value> detail, v8::Isolate* isolate) | 46 static v8::Handle<v8::Value> cacheState(v8::Handle<v8::Object> customEvent, v8::
Handle<v8::Value> detail, v8::Isolate* isolate) |
| (...skipping 12 matching lines...) Expand all Loading... |
| 58 if (!result.IsEmpty()) { | 59 if (!result.IsEmpty()) { |
| 59 v8SetReturnValue(info, result); | 60 v8SetReturnValue(info, result); |
| 60 return; | 61 return; |
| 61 } | 62 } |
| 62 | 63 |
| 63 if (!event->serializedDetail()) { | 64 if (!event->serializedDetail()) { |
| 64 // If we're in an isolated world and the event was created in the main w
orld, | 65 // If we're in an isolated world and the event was created in the main w
orld, |
| 65 // we need to find the 'detail' property on the main world wrapper and c
lone it. | 66 // we need to find the 'detail' property on the main world wrapper and c
lone it. |
| 66 v8::Local<v8::Value> mainWorldDetail = V8HiddenValue::getHiddenValueFrom
MainWorldWrapper(info.GetIsolate(), event, V8HiddenValue::detail(info.GetIsolate
())); | 67 v8::Local<v8::Value> mainWorldDetail = V8HiddenValue::getHiddenValueFrom
MainWorldWrapper(info.GetIsolate(), event, V8HiddenValue::detail(info.GetIsolate
())); |
| 67 if (!mainWorldDetail.IsEmpty()) | 68 if (!mainWorldDetail.IsEmpty()) |
| 68 event->setSerializedDetail(SerializedScriptValue::createAndSwallowEx
ceptions(info.GetIsolate(), mainWorldDetail)); | 69 event->setSerializedDetail(SerializedScriptValueFactory::factory().c
reateAndSwallowExceptions(info.GetIsolate(), mainWorldDetail)); |
| 69 } | 70 } |
| 70 | 71 |
| 71 if (event->serializedDetail()) { | 72 if (event->serializedDetail()) { |
| 72 result = event->serializedDetail()->deserialize(); | 73 result = event->serializedDetail()->deserialize(); |
| 73 v8SetReturnValue(info, cacheState(info.Holder(), result, info.GetIsolate
())); | 74 v8SetReturnValue(info, cacheState(info.Holder(), result, info.GetIsolate
())); |
| 74 return; | 75 return; |
| 75 } | 76 } |
| 76 | 77 |
| 77 v8SetReturnValue(info, cacheState(info.Holder(), v8::Null(info.GetIsolate())
, info.GetIsolate())); | 78 v8SetReturnValue(info, cacheState(info.Holder(), v8::Null(info.GetIsolate())
, info.GetIsolate())); |
| 78 } | 79 } |
| 79 | 80 |
| 80 void V8CustomEvent::initCustomEventMethodCustom(const v8::FunctionCallbackInfo<v
8::Value>& info) | 81 void V8CustomEvent::initCustomEventMethodCustom(const v8::FunctionCallbackInfo<v
8::Value>& info) |
| 81 { | 82 { |
| 82 CustomEvent* event = V8CustomEvent::toImpl(info.Holder()); | 83 CustomEvent* event = V8CustomEvent::toImpl(info.Holder()); |
| 83 ASSERT(!event->serializedDetail()); | 84 ASSERT(!event->serializedDetail()); |
| 84 | 85 |
| 85 TOSTRING_VOID(V8StringResource<>, typeArg, info[0]); | 86 TOSTRING_VOID(V8StringResource<>, typeArg, info[0]); |
| 86 TONATIVE_VOID(bool, canBubbleArg, info[1]->BooleanValue()); | 87 TONATIVE_VOID(bool, canBubbleArg, info[1]->BooleanValue()); |
| 87 TONATIVE_VOID(bool, cancelableArg, info[2]->BooleanValue()); | 88 TONATIVE_VOID(bool, cancelableArg, info[2]->BooleanValue()); |
| 88 v8::Handle<v8::Value> detailsArg = info[3]; | 89 v8::Handle<v8::Value> detailsArg = info[3]; |
| 89 | 90 |
| 90 event->initEvent(typeArg, canBubbleArg, cancelableArg); | 91 event->initEvent(typeArg, canBubbleArg, cancelableArg); |
| 91 | 92 |
| 92 if (!detailsArg.IsEmpty()) { | 93 if (!detailsArg.IsEmpty()) { |
| 93 V8HiddenValue::setHiddenValue(info.GetIsolate(), info.Holder(), V8Hidden
Value::detail(info.GetIsolate()), detailsArg); | 94 V8HiddenValue::setHiddenValue(info.GetIsolate(), info.Holder(), V8Hidden
Value::detail(info.GetIsolate()), detailsArg); |
| 94 if (DOMWrapperWorld::current(info.GetIsolate()).isIsolatedWorld()) | 95 if (DOMWrapperWorld::current(info.GetIsolate()).isIsolatedWorld()) |
| 95 event->setSerializedDetail(SerializedScriptValue::createAndSwallowEx
ceptions(info.GetIsolate(), detailsArg)); | 96 event->setSerializedDetail(SerializedScriptValueFactory::factory().c
reateAndSwallowExceptions(info.GetIsolate(), detailsArg)); |
| 96 } | 97 } |
| 97 } | 98 } |
| 98 | 99 |
| 99 } // namespace blink | 100 } // namespace blink |
| OLD | NEW |