Changeset 133633 in webkit

Timestamp:

Nov 6, 2012 10:19:48 AM (11 years ago)

Author:

abarth@webkit.org

Message:

ScriptWrappable should work for more than just Node
​https://bugs.webkit.org/show_bug.cgi?id=101319

Reviewed by Eric Seidel.

This patch generalizes the inline cached wrapper code path to work with
all subclasses of ScriptWrappable, not just Node.

• bindings/js/JSDOMBinding.h:

(WebCore::setInlineCachedWrapper):
(WebCore::getInlineCachedWrapper):
(WebCore):
(WebCore::clearInlineCachedWrapper):
(WebCore::cacheWrapper):

• bindings/js/JSNodeCustom.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSDOMBinding.h (modified) (3 diffs)
• bindings/js/JSNodeCustom.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-06  Adam Barth  <abarth@webkit.org>
+
+        ScriptWrappable should work for more than just Node
+        https://bugs.webkit.org/show_bug.cgi?id=101319
+
+        Reviewed by Eric Seidel.
+
+        This patch generalizes the inline cached wrapper code path to work with
+        all subclasses of ScriptWrappable, not just Node.
+
+        * bindings/js/JSDOMBinding.h:
+        (WebCore::setInlineCachedWrapper):
+        (WebCore::getInlineCachedWrapper):
+        (WebCore):
+        (WebCore::clearInlineCachedWrapper):
+        (WebCore::cacheWrapper):
+        * bindings/js/JSNodeCustom.h:
+
 2012-11-06  Tiancheng Jiang  <tijiang@rim.com>
 

trunk/Source/WebCore/bindings/js/JSDOMBinding.h

@@ -33 +33 @@
 #include "Element.h"
 #include "MediaList.h"
+#include "ScriptWrappable.h"
 #include "StylePropertySet.h"
 #include "StyledElement.h"
@@ -130 +131 @@
     }
 
-    // Overload these functions to provide a fast path for wrapper access.
     inline JSDOMWrapper* getInlineCachedWrapper(DOMWrapperWorld*, void*) { return 0; }
-    inline bool setInlineCachedWrapper(DOMWrapperWorld*, void*, JSDOMWrapper*) { return false; }
+    inline bool setInlineCachedWrapper(DOMWrapperWorld*, void*, JSDOMWrapper*, JSC::WeakHandleOwner*, void*) { return false; }
     inline bool clearInlineCachedWrapper(DOMWrapperWorld*, void*, JSDOMWrapper*) { return false; }
+
+    inline JSDOMWrapper* getInlineCachedWrapper(DOMWrapperWorld* world, ScriptWrappable* domObject)
+    {
+        if (!world->isNormal())
+            return 0;
+        return domObject->wrapper();
+    }
+
+    inline bool setInlineCachedWrapper(DOMWrapperWorld* world, ScriptWrappable* domObject, JSDOMWrapper* wrapper, JSC::WeakHandleOwner* wrapperOwner, void* context)
+    {
+        if (!world->isNormal())
+            return false;
+        domObject->setWrapper(*world->globalData(), wrapper, wrapperOwner, context);
+        return true;
+    }
+
+    inline bool clearInlineCachedWrapper(DOMWrapperWorld* world, ScriptWrappable* domObject, JSDOMWrapper* wrapper)
+    {
+        if (!world->isNormal())
+            return false;
+        domObject->clearWrapper(wrapper);
+        return true;
+    }
 
     template <typename DOMClass> inline JSDOMWrapper* getCachedWrapper(DOMWrapperWorld* world, DOMClass* domObject)
@@ -144 +167 @@
     template <typename DOMClass> inline void cacheWrapper(DOMWrapperWorld* world, DOMClass* domObject, JSDOMWrapper* wrapper)
     {
-        if (setInlineCachedWrapper(world, domObject, wrapper))
+        JSC::WeakHandleOwner* owner = wrapperOwner(world, domObject);
+        void* context = wrapperContext(world, domObject);
+        if (setInlineCachedWrapper(world, domObject, wrapper, owner, context))
             return;
-        JSC::PassWeak<JSDOMWrapper> passWeak(wrapper, wrapperOwner(world, domObject), wrapperContext(world, domObject));
+        JSC::PassWeak<JSDOMWrapper> passWeak(wrapper, owner, context);
         weakAdd(world->m_wrappers, (void*)domObject, passWeak);
     }

trunk/Source/WebCore/bindings/js/JSNodeCustom.h

@@ -33 +33 @@
 namespace WebCore {
 
-inline JSDOMWrapper* getInlineCachedWrapper(DOMWrapperWorld* world, Node* node)
-{
-    if (!world->isNormal())
-        return 0;
-    return node->wrapper();
-}
-
-inline bool setInlineCachedWrapper(DOMWrapperWorld* world, Node* node, JSDOMWrapper* wrapper)
-{
-    if (!world->isNormal())
-        return false;
-    node->setWrapper(*world->globalData(), wrapper, wrapperOwner(world, node), wrapperContext(world, node));
-    return true;
-}
-
-inline bool clearInlineCachedWrapper(DOMWrapperWorld* world, Node* node, JSDOMWrapper* wrapper)
-{
-    if (!world->isNormal())
-        return false;
-    node->clearWrapper(wrapper);
-    return true;
-}
-
 JSC::JSValue createWrapper(JSC::ExecState*, JSDOMGlobalObject*, Node*);