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

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

Issue 135843008: Remove V8HiddenPropertyName (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 11 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 20 matching lines...) Expand all
31 #include "config.h" 31 #include "config.h"
32 #include "V8CustomEvent.h" 32 #include "V8CustomEvent.h"
33 33
34 #include "RuntimeEnabledFeatures.h" 34 #include "RuntimeEnabledFeatures.h"
35 #include "V8Event.h" 35 #include "V8Event.h"
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"
42 #include "core/dom/ContextFeatures.h" 41 #include "core/dom/ContextFeatures.h"
43 42
44 namespace WebCore { 43 namespace WebCore {
45 44
46 static v8::Handle<v8::Value> cacheState(v8::Handle<v8::Object> customEvent, v8:: Handle<v8::Value> detail, v8::Isolate* isolate) 45 static v8::Handle<v8::Value> cacheState(v8::Handle<v8::Object> customEvent, v8:: Handle<v8::Value> detail, v8::Isolate* isolate)
47 { 46 {
48 customEvent->SetHiddenValue(V8HiddenPropertyName::detail(isolate), detail); 47 setHiddenValue(isolate, customEvent, "detail", detail);
49 return detail; 48 return detail;
50 } 49 }
51 50
52 51
53 void V8CustomEvent::detailAttributeGetterCustom(const v8::PropertyCallbackInfo<v 8::Value>& info) 52 void V8CustomEvent::detailAttributeGetterCustom(const v8::PropertyCallbackInfo<v 8::Value>& info)
54 { 53 {
55 CustomEvent* event = V8CustomEvent::toNative(info.Holder()); 54 CustomEvent* event = V8CustomEvent::toNative(info.Holder());
56 55
57 v8::Handle<v8::Value> result = info.Holder()->GetHiddenValue(V8HiddenPropert yName::detail(info.GetIsolate())); 56 v8::Handle<v8::Value> result = getHiddenValue(info.GetIsolate(), info.Holder (), "detail");
58 57
59 if (!result.IsEmpty()) { 58 if (!result.IsEmpty()) {
60 v8SetReturnValue(info, result); 59 v8SetReturnValue(info, result);
61 return; 60 return;
62 } 61 }
63 62
64 if (!event->serializedDetail()) { 63 if (!event->serializedDetail()) {
65 // 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,
66 // 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.
67 v8::Local<v8::Value> mainWorldDetail = getHiddenValueFromMainWorldWrappe r(info.GetIsolate(), event, V8HiddenPropertyName::detail(info.GetIsolate())); 66 v8::Local<v8::Value> mainWorldDetail = getHiddenValueFromMainWorldWrappe r(info.GetIsolate(), event, "detail");
68 if (!mainWorldDetail.IsEmpty()) 67 if (!mainWorldDetail.IsEmpty())
69 event->setSerializedDetail(SerializedScriptValue::createAndSwallowEx ceptions(mainWorldDetail, info.GetIsolate())); 68 event->setSerializedDetail(SerializedScriptValue::createAndSwallowEx ceptions(mainWorldDetail, info.GetIsolate()));
70 } 69 }
71 70
72 if (event->serializedDetail()) { 71 if (event->serializedDetail()) {
73 result = event->serializedDetail()->deserialize(); 72 result = event->serializedDetail()->deserialize();
74 v8SetReturnValue(info, cacheState(info.Holder(), result, info.GetIsolate ())); 73 v8SetReturnValue(info, cacheState(info.Holder(), result, info.GetIsolate ()));
75 return; 74 return;
76 } 75 }
77 76
78 v8SetReturnValue(info, cacheState(info.Holder(), v8::Null(info.GetIsolate()) , info.GetIsolate())); 77 v8SetReturnValue(info, cacheState(info.Holder(), v8::Null(info.GetIsolate()) , info.GetIsolate()));
79 } 78 }
80 79
81 void V8CustomEvent::initCustomEventMethodCustom(const v8::FunctionCallbackInfo<v 8::Value>& info) 80 void V8CustomEvent::initCustomEventMethodCustom(const v8::FunctionCallbackInfo<v 8::Value>& info)
82 { 81 {
83 CustomEvent* event = V8CustomEvent::toNative(info.Holder()); 82 CustomEvent* event = V8CustomEvent::toNative(info.Holder());
84 ASSERT(!event->serializedDetail()); 83 ASSERT(!event->serializedDetail());
85 84
86 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, typeArg, info[0]); 85 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, typeArg, info[0]);
87 V8TRYCATCH_VOID(bool, canBubbleArg, info[1]->BooleanValue()); 86 V8TRYCATCH_VOID(bool, canBubbleArg, info[1]->BooleanValue());
88 V8TRYCATCH_VOID(bool, cancelableArg, info[2]->BooleanValue()); 87 V8TRYCATCH_VOID(bool, cancelableArg, info[2]->BooleanValue());
89 v8::Handle<v8::Value> detailsArg = info[3]; 88 v8::Handle<v8::Value> detailsArg = info[3];
90 89
91 event->initEvent(typeArg, canBubbleArg, cancelableArg); 90 event->initEvent(typeArg, canBubbleArg, cancelableArg);
92 91
93 if (!detailsArg.IsEmpty()) { 92 if (!detailsArg.IsEmpty()) {
94 info.Holder()->SetHiddenValue(V8HiddenPropertyName::detail(info.GetIsola te()), detailsArg); 93 setHiddenValue(info.GetIsolate(), info.Holder(), "detail", detailsArg);
95 if (isolatedWorldForIsolate(info.GetIsolate())) 94 if (isolatedWorldForIsolate(info.GetIsolate()))
96 event->setSerializedDetail(SerializedScriptValue::createAndSwallowEx ceptions(detailsArg, info.GetIsolate())); 95 event->setSerializedDetail(SerializedScriptValue::createAndSwallowEx ceptions(detailsArg, info.GetIsolate()));
97 } 96 }
98 } 97 }
99 98
100 } // namespace WebCore 99 } // 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