Second part of moving V8 Binding Integrity off of vtables.

Source/bindings/v8/DOMDataStore.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef DOMDataStore_h
 #define DOMDataStore_h
 
 #include "DOMWrapperMap.h"
 #include "DOMWrapperWorld.h"
 #include "Node.h"
-#include "V8GCController.h"
+#include "ScriptWrappable.h"
 #include "WrapperTypeInfo.h"
 #include <v8.h>
 #include <wtf/HashMap.h>
 #include <wtf/MainThread.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/Threading.h>
 #include <wtf/ThreadSpecific.h>
 #include <wtf/Vector.h>
@@ skipping 11 matching lines @@
     template<typename T, typename HolderContainer, typename Wrappable>
     static v8::Handle<v8::Object> getWrapperFast(T* object, const HolderContainer& container, Wrappable* holder)
     {
         // What we'd really like to check here is whether we're in the
         // main world or in an isolated world. The fastest way to do that
         // is to check that there is no isolated world and the 'object'
         // is an object that can exist in the main world. The second fastest
         // way is to check whether the wrappable's wrapper is the same as
         // the holder.
         if ((!DOMWrapperWorld::isolatedWorldsExist() && !canExistInWorker(object)) || holderContainsWrapper(container, holder)) {
-            if (mainWorldWrapperIsStoredInObject(object))
-                return getWrapperFromObject(object);
+            if (ScriptWrappable::wrapperCanBeStoredInObject(object))
+                return ScriptWrappable::getWrapperFromObject(object);
             return mainWorldStore()->m_wrapperMap.get(object);
         }
         return current(container.GetIsolate())->get(object);
     }
 
     template<typename T>
     static v8::Handle<v8::Object> getWrapper(T* object, v8::Isolate* isolate)
     {
-        if (mainWorldWrapperIsStoredInObject(object) && !canExistInWorker(object)) {
+        if (ScriptWrappable::wrapperCanBeStoredInObject(object) && !canExistInWorker(object)) {
             if (LIKELY(!DOMWrapperWorld::isolatedWorldsExist()))
-                return getWrapperFromObject(object);
+                return ScriptWrappable::getWrapperFromObject(object);
         }
         return current(isolate)->get(object);
     }
 
     template<typename T>
     static v8::Handle<v8::Object> getWrapperForMainWorld(T* object)
     {
-        if (mainWorldWrapperIsStoredInObject(object))
-            return getWrapperFromObject(object);
+        if (ScriptWrappable::wrapperCanBeStoredInObject(object))
+            return ScriptWrappable::getWrapperFromObject(object);
         return mainWorldStore()->get(object);
     }
 
     template<typename T>
     static void setWrapper(T* object, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate, const WrapperConfiguration& configuration)
     {
-        if (mainWorldWrapperIsStoredInObject(object) && !canExistInWorker(object)) {
+        if (ScriptWrappable::wrapperCanBeStoredInObject(object) && !canExistInWorker(object)) {
             if (LIKELY(!DOMWrapperWorld::isolatedWorldsExist())) {
-                setWrapperInObject(object, wrapper, isolate, configuration);
+                ScriptWrappable::setWrapperInObject(object, wrapper, isolate, configuration);
                 return;
             }
         }
         return current(isolate)->set(object, wrapper, isolate, configuration);
     }
 
     template<typename T>
     inline v8::Handle<v8::Object> get(T* object)
     {
-        if (mainWorldWrapperIsStoredInObject(object) && m_type == MainWorld)
-            return getWrapperFromObject(object);
+        if (ScriptWrappable::wrapperCanBeStoredInObject(object) && m_type == MainWorld)
+            return ScriptWrappable::getWrapperFromObject(object);
         return m_wrapperMap.get(object);
     }
 
     void reportMemoryUsage(MemoryObjectInfo*) const;
 
 private:
     template<typename T>
     inline void set(T* object, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate, const WrapperConfiguration& configuration)
     {
         ASSERT(!!object);
         ASSERT(!wrapper.IsEmpty());
-        if (mainWorldWrapperIsStoredInObject(object) && m_type == MainWorld) {
-            setWrapperInObject(object, wrapper, isolate, configuration);
+        if (ScriptWrappable::wrapperCanBeStoredInObject(object) && m_type == MainWorld) {
+            ScriptWrappable::setWrapperInObject(object, wrapper, isolate, configuration);
             return;
         }
         m_wrapperMap.set(object, wrapper, configuration);
     }
 
     static DOMDataStore* mainWorldStore();
 
-    static bool mainWorldWrapperIsStoredInObject(void*) { return false; }
-    static bool mainWorldWrapperIsStoredInObject(ScriptWrappable*) { return true; }
-
     static bool canExistInWorker(void*) { return true; }
     static bool canExistInWorker(Node*) { return false; }
 
     template<typename HolderContainer>
     static bool holderContainsWrapper(const HolderContainer&, void*)
     {
         return false;
     }
+
     template<typename HolderContainer>
     static bool holderContainsWrapper(const HolderContainer& container, ScriptWrappable* wrappable)
     {
         // Verify our assumptions about the main world.
         ASSERT(wrappable->wrapper().IsEmpty() || container.Holder() != wrappable->wrapper() || current(v8::Isolate::GetCurrent())->m_type == MainWorld);
         return container.Holder() == wrappable->wrapper();
     }
 
-    static v8::Handle<v8::Object> getWrapperFromObject(void*)
-    {
-        ASSERT_NOT_REACHED();
-        return v8::Handle<v8::Object>();
-    }
-    static v8::Handle<v8::Object> getWrapperFromObject(ScriptWrappable* object)
-    {
-        return object->wrapper();
-    }
-
-    static void setWrapperInObject(void*, v8::Handle<v8::Object>, v8::Isolate*, const WrapperConfiguration&)
-    {
-        ASSERT_NOT_REACHED();
-    }
-    static void setWrapperInObject(ScriptWrappable* object, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate, const WrapperConfiguration& configuration)
-    {
-        object->setWrapper(wrapper, isolate, configuration);
-    }
-
     WrapperWorldType m_type;
     DOMWrapperMap<void> m_wrapperMap;
 };
 
 template<>
 inline void WeakHandleListener<DOMWrapperMap<void> >::callback(v8::Isolate* isolate, v8::Persistent<v8::Value> value, DOMWrapperMap<void>* map)
 {
     ASSERT(value->IsObject());
     v8::Persistent<v8::Object> wrapper = v8::Persistent<v8::Object>::Cast(value);
     WrapperTypeInfo* type = toWrapperTypeInfo(wrapper);
     ASSERT(type->derefObjectFunction);
     void* key = static_cast<void*>(toNative(wrapper));
     map->removeAndDispose(key, wrapper, isolate);
     type->derefObject(key);
 }
 
 } // namespace WebCore
 
 #endif // DOMDataStore_h