Chromium Code Reviews| 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 54 { | 54 { |
| 55 CustomEvent* event = V8CustomEvent::toImpl(info.Holder()); | 55 CustomEvent* event = V8CustomEvent::toImpl(info.Holder()); |
| 56 | 56 |
| 57 v8::Local<v8::Value> result = V8HiddenValue::getHiddenValue(info.GetIsolate( ), info.Holder(), V8HiddenValue::detail(info.GetIsolate())); | 57 v8::Local<v8::Value> result = V8HiddenValue::getHiddenValue(info.GetIsolate( ), info.Holder(), V8HiddenValue::detail(info.GetIsolate())); |
| 58 | 58 |
| 59 if (!result.IsEmpty()) { | 59 if (!result.IsEmpty()) { |
| 60 v8SetReturnValue(info, result); | 60 v8SetReturnValue(info, result); |
| 61 return; | 61 return; |
| 62 } | 62 } |
| 63 | 63 |
| 64 if (!event->serializedDetail()) { | 64 // Be careful not to return a V8 value which is created in different world. |
| 65 // If we're in an isolated world and the event was created in the main w orld, | 65 v8::Local<v8::Value> detail; |
| 66 // we need to find the 'detail' property on the main world wrapper and c lone it. | 66 if (SerializedScriptValue* serializedValue = event->serializedDetail()) |
|
haraken
2015/05/18 01:59:44
This will be problematic in the following scenario
bashi
2015/05/20 00:22:00
As chatted offline, this CL doesn't invoke unneces
| |
| 67 v8::Local<v8::Value> mainWorldDetail = V8HiddenValue::getHiddenValueFrom MainWorldWrapper(info.GetIsolate(), event, V8HiddenValue::detail(info.GetIsolate ())); | 67 detail = serializedValue->deserialize(); |
| 68 if (!mainWorldDetail.IsEmpty()) | 68 else |
| 69 event->setSerializedDetail(SerializedScriptValueFactory::instance(). createAndSwallowExceptions(info.GetIsolate(), mainWorldDetail)); | 69 detail = event->detail().v8ValueFor(ScriptState::current(info.GetIsolate ())); |
| 70 } | 70 // |detail| should be null when it is an empty handle because its default va lue is null. |
| 71 | 71 if (detail.IsEmpty()) |
| 72 if (event->serializedDetail()) { | 72 detail = v8::Null(info.GetIsolate()); |
| 73 result = event->serializedDetail()->deserialize(); | 73 v8SetReturnValue(info, cacheState(info.GetIsolate(), info.Holder(), detail)) ; |
| 74 v8SetReturnValue(info, cacheState(info.GetIsolate(), info.Holder(), resu lt)); | |
| 75 return; | |
| 76 } | |
| 77 | |
| 78 v8SetReturnValue(info, cacheState(info.GetIsolate(), info.Holder(), v8::Null (info.GetIsolate()))); | |
| 79 } | 74 } |
| 80 | 75 |
| 81 void V8CustomEvent::initCustomEventMethodCustom(const v8::FunctionCallbackInfo<v 8::Value>& info) | 76 void V8CustomEvent::initCustomEventMethodCustom(const v8::FunctionCallbackInfo<v 8::Value>& info) |
| 82 { | 77 { |
| 83 CustomEvent* event = V8CustomEvent::toImpl(info.Holder()); | 78 CustomEvent* event = V8CustomEvent::toImpl(info.Holder()); |
| 84 ASSERT(!event->serializedDetail()); | |
| 85 | 79 |
| 86 TOSTRING_VOID(V8StringResource<>, typeArg, info[0]); | 80 TOSTRING_VOID(V8StringResource<>, typeArg, info[0]); |
| 87 bool canBubbleArg; | 81 bool canBubbleArg; |
| 88 bool cancelableArg; | 82 bool cancelableArg; |
| 89 if (!v8Call(info[1]->BooleanValue(info.GetIsolate()->GetCurrentContext()), c anBubbleArg) | 83 if (!v8Call(info[1]->BooleanValue(info.GetIsolate()->GetCurrentContext()), c anBubbleArg) |
| 90 || !v8Call(info[2]->BooleanValue(info.GetIsolate()->GetCurrentContext()) , cancelableArg)) | 84 || !v8Call(info[2]->BooleanValue(info.GetIsolate()->GetCurrentContext()) , cancelableArg)) |
| 91 return; | 85 return; |
| 92 v8::Local<v8::Value> detailsArg = info[3]; | 86 v8::Local<v8::Value> detailsArg = info[3]; |
| 93 | 87 |
| 94 event->initEvent(typeArg, canBubbleArg, cancelableArg); | 88 event->initEvent(typeArg, canBubbleArg, cancelableArg); |
| 95 | 89 event->setDetail(ScriptValue(ScriptState::current(info.GetIsolate()), detail sArg)); |
| 96 if (!detailsArg.IsEmpty()) { | |
| 97 V8HiddenValue::setHiddenValue(info.GetIsolate(), info.Holder(), V8Hidden Value::detail(info.GetIsolate()), detailsArg); | |
| 98 if (DOMWrapperWorld::current(info.GetIsolate()).isIsolatedWorld()) | |
| 99 event->setSerializedDetail(SerializedScriptValueFactory::instance(). createAndSwallowExceptions(info.GetIsolate(), detailsArg)); | |
| 100 } | |
| 101 } | 90 } |
| 102 | 91 |
| 103 } // namespace blink | 92 } // namespace blink |
| OLD | NEW |