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

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

Issue 147333004: Revert of Limit the usage of SharedPersistent to ScriptValue only (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/V8NPObject.cpp ('k') | Source/core/html/HTMLPlugInElement.h » ('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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 15 matching lines...) Expand all
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 32
33 #include "V8HTMLAppletElement.h" 33 #include "V8HTMLAppletElement.h"
34 #include "V8HTMLEmbedElement.h" 34 #include "V8HTMLEmbedElement.h"
35 #include "V8HTMLObjectElement.h" 35 #include "V8HTMLObjectElement.h"
36 #include "bindings/v8/ScriptValue.h" 36 #include "bindings/v8/SharedPersistent.h"
37 #include "bindings/v8/V8Binding.h" 37 #include "bindings/v8/V8Binding.h"
38 #include "bindings/v8/V8NPObject.h" 38 #include "bindings/v8/V8NPObject.h"
39 #include "core/frame/UseCounter.h" 39 #include "core/frame/UseCounter.h"
40 40
41 namespace WebCore { 41 namespace WebCore {
42 42
43 // FIXME: Consider moving getter/setter helpers to V8NPObject and renaming this file to V8PluginElementFunctions 43 // FIXME: Consider moving getter/setter helpers to V8NPObject and renaming this file to V8PluginElementFunctions
44 // to match JSC bindings naming convention. 44 // to match JSC bindings naming convention.
45 45
46 template <class C> 46 template <class C>
47 static void npObjectNamedGetter(v8::Local<v8::String> name, const v8::PropertyCa llbackInfo<v8::Value>& info) 47 static void npObjectNamedGetter(v8::Local<v8::String> name, const v8::PropertyCa llbackInfo<v8::Value>& info)
48 { 48 {
49 HTMLPlugInElement* imp = C::toNative(info.Holder()); 49 HTMLPlugInElement* imp = C::toNative(info.Holder());
50 v8::Handle<v8::Object> instanceTemplate = v8::Handle<v8::Object>::Cast(imp-> pluginWrapper().v8Value()); 50 RefPtr<SharedPersistent<v8::Object> > wrapper = imp->pluginWrapper();
51 if (!wrapper)
52 return;
53
54 v8::Local<v8::Object> instanceTemplate = wrapper->newLocal(info.GetIsolate() );
51 if (instanceTemplate.IsEmpty()) 55 if (instanceTemplate.IsEmpty())
52 return; 56 return;
53 57
54 npObjectGetNamedProperty(instanceTemplate, name, info); 58 npObjectGetNamedProperty(instanceTemplate, name, info);
55 } 59 }
56 60
57 template <class C> 61 template <class C>
58 static void npObjectNamedSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<v8::Value>& info) 62 static void npObjectNamedSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<v8::Value>& info)
59 { 63 {
60 HTMLPlugInElement* imp = C::toNative(info.Holder()); 64 HTMLPlugInElement* imp = C::toNative(info.Holder());
61 v8::Handle<v8::Object> instanceTemplate = v8::Handle<v8::Object>::Cast(imp-> pluginWrapper().v8Value()); 65 RefPtr<SharedPersistent<v8::Object> > wrapper = imp->pluginWrapper();
66 if (!wrapper)
67 return;
68
69 v8::Local<v8::Object> instanceTemplate = wrapper->newLocal(info.GetIsolate() );
62 if (instanceTemplate.IsEmpty()) 70 if (instanceTemplate.IsEmpty())
63 return; 71 return;
64 72
65 npObjectSetNamedProperty(instanceTemplate, name, value, info); 73 npObjectSetNamedProperty(instanceTemplate, name, value, info);
66 } 74 }
67 75
68 void V8HTMLAppletElement::namedPropertyGetterCustom(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info) 76 void V8HTMLAppletElement::namedPropertyGetterCustom(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
69 { 77 {
70 npObjectNamedGetter<V8HTMLAppletElement>(name, info); 78 npObjectNamedGetter<V8HTMLAppletElement>(name, info);
71 } 79 }
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 { 121 {
114 HTMLPlugInElement* imp = V8HTMLObjectElement::toNative(info.Holder()); 122 HTMLPlugInElement* imp = V8HTMLObjectElement::toNative(info.Holder());
115 UseCounter::count(imp->document(), UseCounter::HTMLObjectElementLegacyCall); 123 UseCounter::count(imp->document(), UseCounter::HTMLObjectElementLegacyCall);
116 npObjectInvokeDefaultHandler(info); 124 npObjectInvokeDefaultHandler(info);
117 } 125 }
118 126
119 template <class C> 127 template <class C>
120 void npObjectIndexedGetter(uint32_t index, const v8::PropertyCallbackInfo<v8::Va lue>& info) 128 void npObjectIndexedGetter(uint32_t index, const v8::PropertyCallbackInfo<v8::Va lue>& info)
121 { 129 {
122 HTMLPlugInElement* imp = C::toNative(info.Holder()); 130 HTMLPlugInElement* imp = C::toNative(info.Holder());
123 v8::Handle<v8::Object> instanceTemplate = v8::Handle<v8::Object>::Cast(imp-> pluginWrapper().v8Value()); 131 RefPtr<SharedPersistent<v8::Object> > wrapper = imp->pluginWrapper();
132 if (!wrapper)
133 return;
134
135 v8::Local<v8::Object> instanceTemplate = wrapper->newLocal(info.GetIsolate() );
124 if (instanceTemplate.IsEmpty()) 136 if (instanceTemplate.IsEmpty())
125 return; 137 return;
126 138
127 npObjectGetIndexedProperty(instanceTemplate, index, info); 139 npObjectGetIndexedProperty(instanceTemplate, index, info);
128 } 140 }
129 141
130 template <class C> 142 template <class C>
131 void npObjectIndexedSetter(uint32_t index, v8::Local<v8::Value> value, const v8: :PropertyCallbackInfo<v8::Value>& info) 143 void npObjectIndexedSetter(uint32_t index, v8::Local<v8::Value> value, const v8: :PropertyCallbackInfo<v8::Value>& info)
132 { 144 {
133 HTMLPlugInElement* imp = C::toNative(info.Holder()); 145 HTMLPlugInElement* imp = C::toNative(info.Holder());
134 v8::Handle<v8::Object> instanceTemplate = v8::Handle<v8::Object>::Cast(imp-> pluginWrapper().v8Value()); 146 RefPtr<SharedPersistent<v8::Object> > wrapper = imp->pluginWrapper();
147 if (!wrapper)
148 return;
149
150 v8::Local<v8::Object> instanceTemplate = wrapper->newLocal(info.GetIsolate() );
135 if (instanceTemplate.IsEmpty()) 151 if (instanceTemplate.IsEmpty())
136 return; 152 return;
137 153
138 npObjectSetIndexedProperty(instanceTemplate, index, value, info); 154 npObjectSetIndexedProperty(instanceTemplate, index, value, info);
139 } 155 }
140 156
141 void V8HTMLAppletElement::indexedPropertyGetterCustom(uint32_t index, const v8:: PropertyCallbackInfo<v8::Value>& info) 157 void V8HTMLAppletElement::indexedPropertyGetterCustom(uint32_t index, const v8:: PropertyCallbackInfo<v8::Value>& info)
142 { 158 {
143 npObjectIndexedGetter<V8HTMLAppletElement>(index, info); 159 npObjectIndexedGetter<V8HTMLAppletElement>(index, info);
144 } 160 }
(...skipping 17 matching lines...) Expand all
162 { 178 {
163 npObjectIndexedSetter<V8HTMLEmbedElement>(index, value, info); 179 npObjectIndexedSetter<V8HTMLEmbedElement>(index, value, info);
164 } 180 }
165 181
166 void V8HTMLObjectElement::indexedPropertySetterCustom(uint32_t index, v8::Local< v8::Value> value, const v8::PropertyCallbackInfo<v8::Value>& info) 182 void V8HTMLObjectElement::indexedPropertySetterCustom(uint32_t index, v8::Local< v8::Value> value, const v8::PropertyCallbackInfo<v8::Value>& info)
167 { 183 {
168 npObjectIndexedSetter<V8HTMLObjectElement>(index, value, info); 184 npObjectIndexedSetter<V8HTMLObjectElement>(index, value, info);
169 } 185 }
170 186
171 } // namespace WebCore 187 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/v8/V8NPObject.cpp ('k') | Source/core/html/HTMLPlugInElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698