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

Side by Side Diff: Source/bindings/core/v8/custom/V8CustomEventCustom.cpp

Issue 1097273002: Refactor core/v8/* methods to take isolate as first parameter (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 8 months 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) 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 25 matching lines...) Expand all
36 #include "bindings/core/v8/SerializedScriptValueFactory.h" 36 #include "bindings/core/v8/SerializedScriptValueFactory.h"
37 #include "bindings/core/v8/V8Binding.h" 37 #include "bindings/core/v8/V8Binding.h"
38 #include "bindings/core/v8/V8DOMWrapper.h" 38 #include "bindings/core/v8/V8DOMWrapper.h"
39 #include "bindings/core/v8/V8Event.h" 39 #include "bindings/core/v8/V8Event.h"
40 #include "bindings/core/v8/V8HiddenValue.h" 40 #include "bindings/core/v8/V8HiddenValue.h"
41 #include "core/dom/ContextFeatures.h" 41 #include "core/dom/ContextFeatures.h"
42 #include "platform/RuntimeEnabledFeatures.h" 42 #include "platform/RuntimeEnabledFeatures.h"
43 43
44 namespace blink { 44 namespace blink {
45 45
46 static v8::Local<v8::Value> cacheState(v8::Local<v8::Object> customEvent, v8::Lo cal<v8::Value> detail, v8::Isolate* isolate) 46 static v8::Local<v8::Value> cacheState(v8::Isolate* isolate, v8::Local<v8::Objec t> customEvent, v8::Local<v8::Value> detail)
47 { 47 {
48 V8HiddenValue::setHiddenValue(isolate, customEvent, V8HiddenValue::detail(is olate), detail); 48 V8HiddenValue::setHiddenValue(isolate, customEvent, V8HiddenValue::detail(is olate), detail);
49 return detail; 49 return detail;
50 } 50 }
51 51
52 52
53 void V8CustomEvent::detailAttributeGetterCustom(const v8::PropertyCallbackInfo<v 8::Value>& info) 53 void V8CustomEvent::detailAttributeGetterCustom(const v8::PropertyCallbackInfo<v 8::Value>& info)
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 if (!event->serializedDetail()) {
65 // 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,
66 // 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.
67 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 ()));
68 if (!mainWorldDetail.IsEmpty()) 68 if (!mainWorldDetail.IsEmpty())
69 event->setSerializedDetail(SerializedScriptValueFactory::instance(). createAndSwallowExceptions(info.GetIsolate(), mainWorldDetail)); 69 event->setSerializedDetail(SerializedScriptValueFactory::instance(). createAndSwallowExceptions(info.GetIsolate(), mainWorldDetail));
70 } 70 }
71 71
72 if (event->serializedDetail()) { 72 if (event->serializedDetail()) {
73 result = event->serializedDetail()->deserialize(); 73 result = event->serializedDetail()->deserialize();
74 v8SetReturnValue(info, cacheState(info.Holder(), result, info.GetIsolate ())); 74 v8SetReturnValue(info, cacheState(info.GetIsolate(), info.Holder(), resu lt));
75 return; 75 return;
76 } 76 }
77 77
78 v8SetReturnValue(info, cacheState(info.Holder(), v8::Null(info.GetIsolate()) , info.GetIsolate())); 78 v8SetReturnValue(info, cacheState(info.GetIsolate(), info.Holder(), v8::Null (info.GetIsolate())));
79 } 79 }
80 80
81 void V8CustomEvent::initCustomEventMethodCustom(const v8::FunctionCallbackInfo<v 8::Value>& info) 81 void V8CustomEvent::initCustomEventMethodCustom(const v8::FunctionCallbackInfo<v 8::Value>& info)
82 { 82 {
83 CustomEvent* event = V8CustomEvent::toImpl(info.Holder()); 83 CustomEvent* event = V8CustomEvent::toImpl(info.Holder());
84 ASSERT(!event->serializedDetail()); 84 ASSERT(!event->serializedDetail());
85 85
86 TOSTRING_VOID(V8StringResource<>, typeArg, info[0]); 86 TOSTRING_VOID(V8StringResource<>, typeArg, info[0]);
87 bool canBubbleArg; 87 bool canBubbleArg;
88 bool cancelableArg; 88 bool cancelableArg;
89 if (!v8Call(info[1]->BooleanValue(info.GetIsolate()->GetCurrentContext()), c anBubbleArg) 89 if (!v8Call(info[1]->BooleanValue(info.GetIsolate()->GetCurrentContext()), c anBubbleArg)
90 || !v8Call(info[2]->BooleanValue(info.GetIsolate()->GetCurrentContext()) , cancelableArg)) 90 || !v8Call(info[2]->BooleanValue(info.GetIsolate()->GetCurrentContext()) , cancelableArg))
91 return; 91 return;
92 v8::Local<v8::Value> detailsArg = info[3]; 92 v8::Local<v8::Value> detailsArg = info[3];
93 93
94 event->initEvent(typeArg, canBubbleArg, cancelableArg); 94 event->initEvent(typeArg, canBubbleArg, cancelableArg);
95 95
96 if (!detailsArg.IsEmpty()) { 96 if (!detailsArg.IsEmpty()) {
97 V8HiddenValue::setHiddenValue(info.GetIsolate(), info.Holder(), V8Hidden Value::detail(info.GetIsolate()), detailsArg); 97 V8HiddenValue::setHiddenValue(info.GetIsolate(), info.Holder(), V8Hidden Value::detail(info.GetIsolate()), detailsArg);
98 if (DOMWrapperWorld::current(info.GetIsolate()).isIsolatedWorld()) 98 if (DOMWrapperWorld::current(info.GetIsolate()).isIsolatedWorld())
99 event->setSerializedDetail(SerializedScriptValueFactory::instance(). createAndSwallowExceptions(info.GetIsolate(), detailsArg)); 99 event->setSerializedDetail(SerializedScriptValueFactory::instance(). createAndSwallowExceptions(info.GetIsolate(), detailsArg));
100 } 100 }
101 } 101 }
102 102
103 } // namespace blink 103 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698