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

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

Issue 23637014: Have V8HiddenPropertyName static functions take an isolate in argument (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « Source/bindings/v8/V8WindowShell.cpp ('k') | Source/bindings/v8/custom/V8ErrorEventCustom.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/v8/Dictionary.h" 36 #include "bindings/v8/Dictionary.h"
37 #include "bindings/v8/ScriptState.h" 37 #include "bindings/v8/ScriptState.h"
38 #include "bindings/v8/SerializedScriptValue.h" 38 #include "bindings/v8/SerializedScriptValue.h"
39 #include "bindings/v8/V8Binding.h" 39 #include "bindings/v8/V8Binding.h"
40 #include "bindings/v8/V8DOMWrapper.h" 40 #include "bindings/v8/V8DOMWrapper.h"
41 #include "bindings/v8/V8HiddenPropertyName.h" 41 #include "bindings/v8/V8HiddenPropertyName.h"
42 #include "core/dom/ContextFeatures.h" 42 #include "core/dom/ContextFeatures.h"
43 43
44 namespace WebCore { 44 namespace WebCore {
45 45
46 static v8::Handle<v8::Value> cacheState(v8::Handle<v8::Object> customEvent, v8:: Handle<v8::Value> detail) 46 static v8::Handle<v8::Value> cacheState(v8::Handle<v8::Object> customEvent, v8:: Handle<v8::Value> detail, v8::Isolate* isolate)
47 { 47 {
48 customEvent->SetHiddenValue(V8HiddenPropertyName::detail(), detail); 48 customEvent->SetHiddenValue(V8HiddenPropertyName::detail(isolate), detail);
49 return detail; 49 return detail;
50 } 50 }
51 51
52 52
53 void V8CustomEvent::detailAttributeGetterCustom(v8::Local<v8::String> name, cons t v8::PropertyCallbackInfo<v8::Value>& info) 53 void V8CustomEvent::detailAttributeGetterCustom(v8::Local<v8::String> name, cons t v8::PropertyCallbackInfo<v8::Value>& info)
54 { 54 {
55 CustomEvent* event = V8CustomEvent::toNative(info.Holder()); 55 CustomEvent* event = V8CustomEvent::toNative(info.Holder());
56 56
57 v8::Handle<v8::Value> result = info.Holder()->GetHiddenValue(V8HiddenPropert yName::detail()); 57 v8::Handle<v8::Value> result = info.Holder()->GetHiddenValue(V8HiddenPropert yName::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 = getHiddenValueFromMainWorldWrappe r(info.GetIsolate(), event, V8HiddenPropertyName::detail()); 67 v8::Local<v8::Value> mainWorldDetail = getHiddenValueFromMainWorldWrappe r(info.GetIsolate(), event, V8HiddenPropertyName::detail(info.GetIsolate()));
68 if (!mainWorldDetail.IsEmpty()) 68 if (!mainWorldDetail.IsEmpty())
69 event->setSerializedDetail(SerializedScriptValue::createAndSwallowEx ceptions(mainWorldDetail, info.GetIsolate())); 69 event->setSerializedDetail(SerializedScriptValue::createAndSwallowEx ceptions(mainWorldDetail, info.GetIsolate()));
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)); 74 v8SetReturnValue(info, cacheState(info.Holder(), result, info.GetIsolate ()));
75 return; 75 return;
76 } 76 }
77 77
78 v8SetReturnValue(info, cacheState(info.Holder(), v8::Null(info.GetIsolate()) )); 78 v8SetReturnValue(info, cacheState(info.Holder(), v8::Null(info.GetIsolate()) , info.GetIsolate()));
79 } 79 }
80 80
81 void V8CustomEvent::initCustomEventMethodCustom(const v8::FunctionCallbackInfo<v 8::Value>& args) 81 void V8CustomEvent::initCustomEventMethodCustom(const v8::FunctionCallbackInfo<v 8::Value>& args)
82 { 82 {
83 CustomEvent* event = V8CustomEvent::toNative(args.Holder()); 83 CustomEvent* event = V8CustomEvent::toNative(args.Holder());
84 ASSERT(!event->serializedDetail()); 84 ASSERT(!event->serializedDetail());
85 85
86 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, typeArg, args[0]); 86 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, typeArg, args[0]);
87 V8TRYCATCH_VOID(bool, canBubbleArg, args[1]->BooleanValue()); 87 V8TRYCATCH_VOID(bool, canBubbleArg, args[1]->BooleanValue());
88 V8TRYCATCH_VOID(bool, cancelableArg, args[2]->BooleanValue()); 88 V8TRYCATCH_VOID(bool, cancelableArg, args[2]->BooleanValue());
89 v8::Handle<v8::Value> detailsArg = args[3]; 89 v8::Handle<v8::Value> detailsArg = args[3];
90 90
91 event->initEvent(typeArg, canBubbleArg, cancelableArg); 91 event->initEvent(typeArg, canBubbleArg, cancelableArg);
92 92
93 if (!detailsArg.IsEmpty()) { 93 if (!detailsArg.IsEmpty()) {
94 args.Holder()->SetHiddenValue(V8HiddenPropertyName::detail(), detailsArg ); 94 args.Holder()->SetHiddenValue(V8HiddenPropertyName::detail(args.GetIsola te()), detailsArg);
95 if (isolatedWorldForIsolate(args.GetIsolate())) 95 if (isolatedWorldForIsolate(args.GetIsolate()))
96 event->setSerializedDetail(SerializedScriptValue::createAndSwallowEx ceptions(detailsArg, args.GetIsolate())); 96 event->setSerializedDetail(SerializedScriptValue::createAndSwallowEx ceptions(detailsArg, args.GetIsolate()));
97 } 97 }
98 } 98 }
99 99
100 } // namespace WebCore 100 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/v8/V8WindowShell.cpp ('k') | Source/bindings/v8/custom/V8ErrorEventCustom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698