Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / bindings / v8 / V8DOMWrapper.h

diff --git a/src/third_party/WebKit/Source/bindings/v8/V8DOMWrapper.h b/src/third_party/WebKit/Source/bindings/v8/V8DOMWrapper.h
index 97033b9..bc078e4 100644 (file)
--- a/src/third_party/WebKit/Source/bindings/v8/V8DOMWrapper.h
+++ b/src/third_party/WebKit/Source/bindings/v8/V8DOMWrapper.h
@@ -34,6 +34,7 @@
 #include "bindings/v8/DOMDataStore.h"
 #include <v8.h>
 #include "wtf/PassRefPtr.h"
+#include "wtf/RawPtr.h"
 #include "wtf/text/AtomicString.h"
 
 namespace WebCore {
@@ -42,20 +43,19 @@ struct WrapperTypeInfo;
 
     class V8DOMWrapper {
     public:
-#ifndef NDEBUG
-        // Checks if a v8 value can be a DOM wrapper
-        static bool maybeDOMWrapper(v8::Handle<v8::Value>);
-#endif
-
         static v8::Local<v8::Object> createWrapper(v8::Handle<v8::Object> creationContext, const WrapperTypeInfo*, void*, v8::Isolate*);
 
         template<typename V8T, typename T>
         static inline v8::Handle<v8::Object> associateObjectWithWrapper(PassRefPtr<T>, const WrapperTypeInfo*, v8::Handle<v8::Object>, v8::Isolate*, WrapperConfiguration::Lifetime);
+        template<typename V8T, typename T>
+        static inline v8::Handle<v8::Object> associateObjectWithWrapper(RawPtr<T>, const WrapperTypeInfo*, v8::Handle<v8::Object>, v8::Isolate*, WrapperConfiguration::Lifetime);
+        template<typename V8T, typename T>
+        static inline v8::Handle<v8::Object> associateObjectWithWrapper(T*, const WrapperTypeInfo*, v8::Handle<v8::Object>, v8::Isolate*, WrapperConfiguration::Lifetime);
         static inline void setNativeInfo(v8::Handle<v8::Object>, const WrapperTypeInfo*, void*);
+        static inline void setNativeInfoWithPersistentHandle(v8::Handle<v8::Object>, const WrapperTypeInfo*, void*, PersistentNode*);
         static inline void clearNativeInfo(v8::Handle<v8::Object>, const WrapperTypeInfo*);
 
         static bool isDOMWrapper(v8::Handle<v8::Value>);
-        static bool isWrapperOfType(v8::Handle<v8::Value>, const WrapperTypeInfo*);
     };
 
     inline void V8DOMWrapper::setNativeInfo(v8::Handle<v8::Object> wrapper, const WrapperTypeInfo* type, void* object)
@@ -63,14 +63,31 @@ struct WrapperTypeInfo;
         ASSERT(wrapper->InternalFieldCount() >= 2);
         ASSERT(object);
         ASSERT(type);
+#if ENABLE(OILPAN)
+        ASSERT(!type->isGarbageCollected);
+#endif
+        wrapper->SetAlignedPointerInInternalField(v8DOMWrapperObjectIndex, object);
+        wrapper->SetAlignedPointerInInternalField(v8DOMWrapperTypeIndex, const_cast<WrapperTypeInfo*>(type));
+    }
+
+    inline void V8DOMWrapper::setNativeInfoWithPersistentHandle(v8::Handle<v8::Object> wrapper, const WrapperTypeInfo* type, void* object, PersistentNode* handle)
+    {
+        ASSERT(wrapper->InternalFieldCount() >= 3);
+        ASSERT(object);
+        ASSERT(type);
+        ASSERT(type->isGarbageCollected);
         wrapper->SetAlignedPointerInInternalField(v8DOMWrapperObjectIndex, object);
         wrapper->SetAlignedPointerInInternalField(v8DOMWrapperTypeIndex, const_cast<WrapperTypeInfo*>(type));
+        // Persistent handle is stored in the last internal field.
+        wrapper->SetAlignedPointerInInternalField(wrapper->InternalFieldCount() - 1, handle);
     }
 
     inline void V8DOMWrapper::clearNativeInfo(v8::Handle<v8::Object> wrapper, const WrapperTypeInfo* type)
     {
         ASSERT(wrapper->InternalFieldCount() >= 2);
         ASSERT(type);
+        // clearNativeInfo() is used only by NP objects, which are not garbage collected.
+        ASSERT(!type->isGarbageCollected);
         wrapper->SetAlignedPointerInInternalField(v8DOMWrapperTypeIndex, const_cast<WrapperTypeInfo*>(type));
         wrapper->SetAlignedPointerInInternalField(v8DOMWrapperObjectIndex, 0);
     }
@@ -79,17 +96,27 @@ struct WrapperTypeInfo;
     inline v8::Handle<v8::Object> V8DOMWrapper::associateObjectWithWrapper(PassRefPtr<T> object, const WrapperTypeInfo* type, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate, WrapperConfiguration::Lifetime lifetime)
     {
         setNativeInfo(wrapper, type, V8T::toInternalPointer(object.get()));
-        ASSERT(maybeDOMWrapper(wrapper));
+        ASSERT(isDOMWrapper(wrapper));
         WrapperConfiguration configuration = buildWrapperConfiguration(object.get(), lifetime);
         DOMDataStore::setWrapper<V8T>(object.leakRef(), wrapper, isolate, configuration);
         return wrapper;
     }
 
+    template<typename V8T, typename T>
+    inline v8::Handle<v8::Object> V8DOMWrapper::associateObjectWithWrapper(RawPtr<T> object, const WrapperTypeInfo* type, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate, WrapperConfiguration::Lifetime lifetime)
+    {
+        setNativeInfoWithPersistentHandle(wrapper, type, V8T::toInternalPointer(object.get()), new Persistent<T>(object));
+        ASSERT(isDOMWrapper(wrapper));
+        WrapperConfiguration configuration = buildWrapperConfiguration(object.get(), lifetime);
+        DOMDataStore::setWrapper<V8T>(object.get(), wrapper, isolate, configuration);
+        return wrapper;
+    }
+
     class V8WrapperInstantiationScope {
     public:
         V8WrapperInstantiationScope(v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
             : m_didEnterContext(false)
-            , m_context(v8::Context::GetCurrent())
+            , m_context(isolate->GetCurrentContext())
         {
             // FIXME: Remove all empty creationContexts from caller sites.
             // If a creationContext is empty, we will end up creating a new object