Changeset 133810 in webkit

Timestamp:

Nov 7, 2012 3:11:23 PM (12 years ago)

Author:

abarth@webkit.org

Message:

[V8] IntrusiveDOMWrapperMap should be usable for more than just Nodes
​https://bugs.webkit.org/show_bug.cgi?id=101110

Reviewed by Kentaro Hara.

This patch generalizes our support for storing wrappers in DOM objects
to be usable for more than just nodes. After this patch, any object
with a ScriptWrappable base class will have its wrapper stored inline
in the object in the main world.

• bindings/v8/DOMDataStore.cpp:

(WebCore::DOMDataStore::weakCallback):

• bindings/v8/DOMDataStore.h:

(WebCore::DOMDataStore::get):
(WebCore::DOMDataStore::set):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/DOMDataStore.cpp (modified) (1 diff)
• bindings/v8/DOMDataStore.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-07  Adam Barth  <abarth@webkit.org>
+
+        [V8] IntrusiveDOMWrapperMap should be usable for more than just Nodes
+        https://bugs.webkit.org/show_bug.cgi?id=101110
+
+        Reviewed by Kentaro Hara.
+
+        This patch generalizes our support for storing wrappers in DOM objects
+        to be usable for more than just nodes. After this patch, any object
+        with a ScriptWrappable base class will have its wrapper stored inline
+        in the object in the main world.
+
+        * bindings/v8/DOMDataStore.cpp:
+        (WebCore::DOMDataStore::weakCallback):
+        * bindings/v8/DOMDataStore.h:
+        (WebCore::DOMDataStore::get):
+        (WebCore::DOMDataStore::set):
+
 2012-11-07  Tiancheng Jiang  <tijiang@rim.com>
 

trunk/Source/WebCore/bindings/v8/DOMDataStore.cpp

@@ -73 +73 @@
 void DOMDataStore::weakCallback(v8::Persistent<v8::Value> value, void* context)
 {
-    Node* object = static_cast<Node*>(context);
+    ScriptWrappable* key = static_cast<ScriptWrappable*>(context);
     ASSERT(value->IsObject());
-    ASSERT(object->wrapper() == v8::Persistent<v8::Object>::Cast(value));
+    v8::Persistent<v8::Object> wrapper = v8::Persistent<v8::Object>::Cast(value);
+    ASSERT(key->wrapper() == wrapper);
+    // Note: |object| might not be equal to |key|, e.g., if ScriptWrappable isn't a left-most base class.
+    void* object = toNative(wrapper);
+    WrapperTypeInfo* info = toWrapperTypeInfo(wrapper);
 
-    object->clearWrapper();
+    key->clearWrapper();
     value.Dispose();
     value.Clear();
-    object->deref();
+    info->derefObject(object);
 }
 

trunk/Source/WebCore/bindings/v8/DOMDataStore.h

@@ -60 +60 @@
     static DOMDataStore* current(v8::Isolate*);
 
-    inline v8::Handle<v8::Object> get(void* object) const { return m_domObjectMap->get(object); }
-    inline v8::Handle<v8::Object> get(Node* object) const
+    template<typename T>
+    inline v8::Handle<v8::Object> get(T* object) const
     {
-        if (m_type == MainWorld)
-            return object->wrapper();
+        if (wrapperIsStoredInObject(object))
+            return getWrapperFromObject(object);
         return m_domObjectMap->get(object);
     }
 
-    inline void set(void* object, v8::Persistent<v8::Object> wrapper) { m_domObjectMap->set(object, wrapper); }
-    inline void set(Node* object, v8::Persistent<v8::Object> wrapper)
+    template<typename T>
+    inline void set(T* object, v8::Persistent<v8::Object> wrapper)
     {
-        if (m_type == MainWorld) {
-            ASSERT(object->wrapper().IsEmpty());
-            object->setWrapper(wrapper);
-            wrapper.MakeWeak(object, weakCallback);
+        if (setWrapperInObject(object, wrapper))
             return;
-        }
         m_domObjectMap->set(object, wrapper);
     }
@@ -83 +79 @@
 
 private:
+    bool wrapperIsStoredInObject(void*) const { return false; }
+    bool wrapperIsStoredInObject(ScriptWrappable*) const { return m_type == MainWorld; }
+
+    v8::Handle<v8::Object> getWrapperFromObject(void*) const
+    {
+        ASSERT_NOT_REACHED();
+        return v8::Handle<v8::Object>();
+    }
+
+    v8::Handle<v8::Object> getWrapperFromObject(ScriptWrappable* object) const
+    {
+        ASSERT(m_type == MainWorld);
+        return object->wrapper();
+    }
+
+    bool setWrapperInObject(void*, v8::Persistent<v8::Object>) { return false; }
+    bool setWrapperInObject(ScriptWrappable* object, v8::Persistent<v8::Object> wrapper)
+    {
+        if (m_type != MainWorld)
+            return false;
+        ASSERT(object->wrapper().IsEmpty());
+        ASSERT(m_domObjectMap->get(toNative(wrapper)).IsEmpty());
+        object->setWrapper(wrapper);
+        wrapper.MakeWeak(object, weakCallback);
+        return true;
+    }
+
     static void weakCallback(v8::Persistent<v8::Value>, void* context);