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

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

Issue 686103005: Move the v8::Isolate* parameter to the first parameter of various binding methods in third_party/We… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 1 month 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 if (!result.IsEmpty()) { 58 if (!result.IsEmpty()) {
59 v8SetReturnValue(info, result); 59 v8SetReturnValue(info, result);
60 return; 60 return;
61 } 61 }
62 62
63 if (!event->serializedDetail()) { 63 if (!event->serializedDetail()) {
64 // If we're in an isolated world and the event was created in the main w orld, 64 // 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. 65 // 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 ())); 66 v8::Local<v8::Value> mainWorldDetail = V8HiddenValue::getHiddenValueFrom MainWorldWrapper(info.GetIsolate(), event, V8HiddenValue::detail(info.GetIsolate ()));
67 if (!mainWorldDetail.IsEmpty()) 67 if (!mainWorldDetail.IsEmpty())
68 event->setSerializedDetail(SerializedScriptValue::createAndSwallowEx ceptions(mainWorldDetail, info.GetIsolate())); 68 event->setSerializedDetail(SerializedScriptValue::createAndSwallowEx ceptions(info.GetIsolate(), mainWorldDetail));
69 } 69 }
70 70
71 if (event->serializedDetail()) { 71 if (event->serializedDetail()) {
72 result = event->serializedDetail()->deserialize(); 72 result = event->serializedDetail()->deserialize();
73 v8SetReturnValue(info, cacheState(info.Holder(), result, info.GetIsolate ())); 73 v8SetReturnValue(info, cacheState(info.Holder(), result, info.GetIsolate ()));
74 return; 74 return;
75 } 75 }
76 76
77 v8SetReturnValue(info, cacheState(info.Holder(), v8::Null(info.GetIsolate()) , info.GetIsolate())); 77 v8SetReturnValue(info, cacheState(info.Holder(), v8::Null(info.GetIsolate()) , info.GetIsolate()));
78 } 78 }
79 79
80 void V8CustomEvent::initCustomEventMethodCustom(const v8::FunctionCallbackInfo<v 8::Value>& info) 80 void V8CustomEvent::initCustomEventMethodCustom(const v8::FunctionCallbackInfo<v 8::Value>& info)
81 { 81 {
82 CustomEvent* event = V8CustomEvent::toImpl(info.Holder()); 82 CustomEvent* event = V8CustomEvent::toImpl(info.Holder());
83 ASSERT(!event->serializedDetail()); 83 ASSERT(!event->serializedDetail());
84 84
85 TOSTRING_VOID(V8StringResource<>, typeArg, info[0]); 85 TOSTRING_VOID(V8StringResource<>, typeArg, info[0]);
86 TONATIVE_VOID(bool, canBubbleArg, info[1]->BooleanValue()); 86 TONATIVE_VOID(bool, canBubbleArg, info[1]->BooleanValue());
87 TONATIVE_VOID(bool, cancelableArg, info[2]->BooleanValue()); 87 TONATIVE_VOID(bool, cancelableArg, info[2]->BooleanValue());
88 v8::Handle<v8::Value> detailsArg = info[3]; 88 v8::Handle<v8::Value> detailsArg = info[3];
89 89
90 event->initEvent(typeArg, canBubbleArg, cancelableArg); 90 event->initEvent(typeArg, canBubbleArg, cancelableArg);
91 91
92 if (!detailsArg.IsEmpty()) { 92 if (!detailsArg.IsEmpty()) {
93 V8HiddenValue::setHiddenValue(info.GetIsolate(), info.Holder(), V8Hidden Value::detail(info.GetIsolate()), detailsArg); 93 V8HiddenValue::setHiddenValue(info.GetIsolate(), info.Holder(), V8Hidden Value::detail(info.GetIsolate()), detailsArg);
94 if (DOMWrapperWorld::current(info.GetIsolate()).isIsolatedWorld()) 94 if (DOMWrapperWorld::current(info.GetIsolate()).isIsolatedWorld())
95 event->setSerializedDetail(SerializedScriptValue::createAndSwallowEx ceptions(detailsArg, info.GetIsolate())); 95 event->setSerializedDetail(SerializedScriptValue::createAndSwallowEx ceptions(info.GetIsolate(), detailsArg));
96 } 96 }
97 } 97 }
98 98
99 } // namespace blink 99 } // namespace blink
OLDNEW
« no previous file with comments | « Source/bindings/core/v8/WorkerScriptController.cpp ('k') | Source/bindings/core/v8/custom/V8DocumentCustom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698