&& ScriptWrappable::wrapperCanBeStoredInObject(object);
}
+ static bool canUseScriptWrappableNonTemplate(Node* object)
+ {
+ // Node cannot exist in workers and a wrapper can be stored in Node
+ // which (indirectly) derives ScriptWrappable.
+ return !DOMWrapperWorld::isolatedWorldsExist();
+ }
+
template<typename V8T, typename T, typename Wrappable>
static bool setReturnValueFromWrapperFast(v8::ReturnValue<v8::Value> returnValue, T* object, v8::Local<v8::Object> holder, Wrappable* wrappable)
{
ScriptWrappable::assertWrapperSanity<V8T, T>(object, object);
return ScriptWrappable::fromObject(object)->setReturnValue(returnValue);
}
- return DOMWrapperWorld::mainWorld().domDataStore().m_wrapperMap.setReturnValueFrom(returnValue, V8T::toInternalPointer(object));
+ return DOMWrapperWorld::mainWorld().domDataStore().m_wrapperMap.setReturnValueFrom(returnValue, V8T::toScriptWrappableBase(object));
}
return current(returnValue.GetIsolate()).template setReturnValueFrom<V8T>(returnValue, object);
}
{
if (ScriptWrappable::wrapperCanBeStoredInObject(object))
return ScriptWrappable::fromObject(object)->setReturnValue(returnValue);
- return DOMWrapperWorld::mainWorld().domDataStore().m_wrapperMap.setReturnValueFrom(returnValue, V8T::toInternalPointer(object));
+ return DOMWrapperWorld::mainWorld().domDataStore().m_wrapperMap.setReturnValueFrom(returnValue, V8T::toScriptWrappableBase(object));
}
template<typename V8T, typename T>
return current(isolate).template get<V8T>(object, isolate);
}
+ static v8::Handle<v8::Object> getWrapperNonTemplate(ScriptWrappableBase* object, v8::Isolate* isolate)
+ {
+ return current(isolate).getNonTemplate(object, isolate);
+ }
+
+ static v8::Handle<v8::Object> getWrapperNonTemplate(ScriptWrappable* object, v8::Isolate* isolate)
+ {
+ return current(isolate).getNonTemplate(object, isolate);
+ }
+
+ static v8::Handle<v8::Object> getWrapperNonTemplate(Node* node, v8::Isolate* isolate)
+ {
+ if (canUseScriptWrappableNonTemplate(node)) {
+ v8::Handle<v8::Object> result = ScriptWrappable::fromObject(node)->newLocalWrapper(isolate);
+ // Security: always guard against malicious tampering.
+ ScriptWrappable::fromObject(node)->assertWrapperSanity(result);
+ return result;
+ }
+ return current(isolate).getNonTemplate(ScriptWrappable::fromObject(node), isolate);
+ }
+
template<typename V8T, typename T>
static void setWrapperReference(const v8::Persistent<v8::Object>& parent, T* child, v8::Isolate* isolate)
{
}
template<typename V8T, typename T>
- static void setWrapper(T* object, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate, const WrapperConfiguration& configuration)
+ static void setWrapper(T* object, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate, const WrapperTypeInfo* wrapperTypeInfo)
{
if (canUseScriptWrappable(object)) {
- ScriptWrappable::fromObject(object)->setWrapper(wrapper, isolate, configuration);
+ ScriptWrappable::fromObject(object)->setWrapper(wrapper, isolate, wrapperTypeInfo);
return;
}
- return current(isolate).template set<V8T>(object, wrapper, isolate, configuration);
+ return current(isolate).template set<V8T>(object, wrapper, isolate, wrapperTypeInfo);
+ }
+
+ static void setWrapperNonTemplate(ScriptWrappableBase* object, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate, const WrapperTypeInfo* wrapperTypeInfo)
+ {
+ return current(isolate).setNonTemplate(object, wrapper, isolate, wrapperTypeInfo);
+ }
+
+ static void setWrapperNonTemplate(ScriptWrappable* object, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate, const WrapperTypeInfo* wrapperTypeInfo)
+ {
+ return current(isolate).setNonTemplate(object, wrapper, isolate, wrapperTypeInfo);
+ }
+
+ static void setWrapperNonTemplate(Node* node, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate, const WrapperTypeInfo* wrapperTypeInfo)
+ {
+ if (canUseScriptWrappableNonTemplate(node)) {
+ ScriptWrappable::fromObject(node)->setWrapper(wrapper, isolate, wrapperTypeInfo);
+ return;
+ }
+ return current(isolate).setNonTemplate(ScriptWrappable::fromObject(node), wrapper, isolate, wrapperTypeInfo);
}
template<typename V8T, typename T>
return current(isolate).template containsWrapper<V8T>(object);
}
+ static bool containsWrapperNonTemplate(ScriptWrappableBase* object, v8::Isolate* isolate)
+ {
+ return current(isolate).containsWrapperNonTemplate(object);
+ }
+
+ static bool containsWrapperNonTemplate(ScriptWrappable* object, v8::Isolate* isolate)
+ {
+ return current(isolate).containsWrapperNonTemplate(object);
+ }
+
template<typename V8T, typename T>
- inline v8::Handle<v8::Object> get(T* object, v8::Isolate* isolate)
+ v8::Handle<v8::Object> get(T* object, v8::Isolate* isolate)
{
if (ScriptWrappable::wrapperCanBeStoredInObject(object) && m_isMainWorld)
return ScriptWrappable::fromObject(object)->newLocalWrapper(isolate);
- return m_wrapperMap.newLocal(V8T::toInternalPointer(object), isolate);
+ return m_wrapperMap.newLocal(V8T::toScriptWrappableBase(object), isolate);
+ }
+
+ v8::Handle<v8::Object> getNonTemplate(ScriptWrappableBase* object, v8::Isolate* isolate)
+ {
+ return m_wrapperMap.newLocal(object->toScriptWrappableBase(), isolate);
+ }
+
+ v8::Handle<v8::Object> getNonTemplate(ScriptWrappable* object, v8::Isolate* isolate)
+ {
+ if (m_isMainWorld)
+ return object->newLocalWrapper(isolate);
+ return m_wrapperMap.newLocal(object->toScriptWrappableBase(), isolate);
}
template<typename V8T, typename T>
- inline void setReference(const v8::Persistent<v8::Object>& parent, T* child, v8::Isolate* isolate)
+ void setReference(const v8::Persistent<v8::Object>& parent, T* child, v8::Isolate* isolate)
{
if (ScriptWrappable::wrapperCanBeStoredInObject(child) && m_isMainWorld) {
ScriptWrappable::fromObject(child)->setReference(parent, isolate);
return;
}
- m_wrapperMap.setReference(parent, V8T::toInternalPointer(child), isolate);
+ m_wrapperMap.setReference(parent, V8T::toScriptWrappableBase(child), isolate);
}
template<typename V8T, typename T>
- inline bool setReturnValueFrom(v8::ReturnValue<v8::Value> returnValue, T* object)
+ bool setReturnValueFrom(v8::ReturnValue<v8::Value> returnValue, T* object)
{
if (ScriptWrappable::wrapperCanBeStoredInObject(object) && m_isMainWorld)
return ScriptWrappable::fromObject(object)->setReturnValue(returnValue);
- return m_wrapperMap.setReturnValueFrom(returnValue, V8T::toInternalPointer(object));
+ return m_wrapperMap.setReturnValueFrom(returnValue, V8T::toScriptWrappableBase(object));
}
template<typename V8T, typename T>
- inline bool containsWrapper(T* object)
+ bool containsWrapper(T* object)
{
if (ScriptWrappable::wrapperCanBeStoredInObject(object) && m_isMainWorld)
return ScriptWrappable::fromObject(object)->containsWrapper();
- return m_wrapperMap.containsKey(V8T::toInternalPointer(object));
+ return m_wrapperMap.containsKey(V8T::toScriptWrappableBase(object));
+ }
+
+ bool containsWrapperNonTemplate(ScriptWrappableBase* object)
+ {
+ return m_wrapperMap.containsKey(object->toScriptWrappableBase());
+ }
+
+ bool containsWrapperNonTemplate(ScriptWrappable* object)
+ {
+ if (m_isMainWorld)
+ return object->containsWrapper();
+ return m_wrapperMap.containsKey(object->toScriptWrappableBase());
}
private:
template<typename V8T, typename T>
- inline void set(T* object, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate, const WrapperConfiguration& configuration)
+ void set(T* object, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate, const WrapperTypeInfo* wrapperTypeInfo)
{
- ASSERT(!!object);
+ ASSERT(object);
ASSERT(!wrapper.IsEmpty());
if (ScriptWrappable::wrapperCanBeStoredInObject(object) && m_isMainWorld) {
- ScriptWrappable::fromObject(object)->setWrapper(wrapper, isolate, configuration);
+ ScriptWrappable::fromObject(object)->setWrapper(wrapper, isolate, wrapperTypeInfo);
+ return;
+ }
+ m_wrapperMap.set(V8T::toScriptWrappableBase(object), wrapper, wrapperTypeInfo);
+ }
+
+ void setNonTemplate(ScriptWrappableBase* object, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate, const WrapperTypeInfo* wrapperTypeInfo)
+ {
+ ASSERT(object);
+ ASSERT(!wrapper.IsEmpty());
+ m_wrapperMap.set(object->toScriptWrappableBase(), wrapper, wrapperTypeInfo);
+ }
+
+ void setNonTemplate(ScriptWrappable* object, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate, const WrapperTypeInfo* wrapperTypeInfo)
+ {
+ ASSERT(object);
+ ASSERT(!wrapper.IsEmpty());
+ if (m_isMainWorld) {
+ ScriptWrappable::fromObject(object)->setWrapper(wrapper, isolate, wrapperTypeInfo);
return;
}
- m_wrapperMap.set(V8T::toInternalPointer(object), wrapper, configuration);
+ m_wrapperMap.set(object->toScriptWrappableBase(), wrapper, wrapperTypeInfo);
}
static bool canExistInWorker(void*) { return true; }