bindings: Retires ScriptWrappableBase mostly.

Source/bindings/core/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 43 matching lines @@
         // We never actually destruct the main world's DOMDataStore.
         ASSERT(!m_isMainWorld);
         m_wrapperMap.clear();
     }
 
     static DOMDataStore& current(v8::Isolate* isolate)
     {
         return DOMWrapperWorld::current(isolate).domDataStore();
     }
 
-    static bool setReturnValueFast(v8::ReturnValue<v8::Value> returnValue, ScriptWrappable* object, v8::Local<v8::Object> holder, const ScriptWrappable* wrappable)
-    {
-        // The second fastest way to check if we're in the main world is to check if
-        // the wrappable's wrapper is the same as the holder.
-        if (holderContainsWrapper(holder, wrappable))
-            return object->setReturnValue(returnValue);
-        return current(returnValue.GetIsolate()).setReturnValueFrom(returnValue, object);
-    }
-
-    static bool setReturnValueFast(v8::ReturnValue<v8::Value> returnValue, Node* node, v8::Local<v8::Object> holder, const ScriptWrappable* wrappable)
-    {
-        if (canUseScriptWrappable(node)
-            // The second fastest way to check if we're in the main world is to
-            // check if the wrappable's wrapper is the same as the holder.
-            || holderContainsWrapper(holder, wrappable))
-            return ScriptWrappable::fromNode(node)->setReturnValue(returnValue);
-        return current(returnValue.GetIsolate()).setReturnValueFrom(returnValue, ScriptWrappable::fromNode(node));
-    }
-
-    static bool setReturnValue(v8::ReturnValue<v8::Value> returnValue, ScriptWrappableBase* object)
-    {
-        return current(returnValue.GetIsolate()).setReturnValueFrom(returnValue, object);
-    }
-
     static bool setReturnValue(v8::ReturnValue<v8::Value> returnValue, ScriptWrappable* object)
     {
         return current(returnValue.GetIsolate()).setReturnValueFrom(returnValue, object);
     }
 
     static bool setReturnValue(v8::ReturnValue<v8::Value> returnValue, Node* object)
     {
         if (canUseScriptWrappable(object))
             return ScriptWrappable::fromNode(object)->setReturnValue(returnValue);
         return current(returnValue.GetIsolate()).setReturnValueFrom(returnValue, ScriptWrappable::fromNode(object));
     }
 
     static bool setReturnValueForMainWorld(v8::ReturnValue<v8::Value> returnValue, ScriptWrappable* object)
     {
         return object->setReturnValue(returnValue);
     }
 
-    static v8::Handle<v8::Object> getWrapper(ScriptWrappableBase* object, v8::Isolate* isolate)
+    static bool setReturnValueFast(v8::ReturnValue<v8::Value> returnValue, ScriptWrappable* object, v8::Local<v8::Object> holder, const ScriptWrappable* wrappable)
     {
-        return current(isolate).get(object, isolate);
+        // The second fastest way to check if we're in the main world is to check if
+        // the wrappable's wrapper is the same as the holder.
+        if (holderContainsWrapper(holder, wrappable))
+            return object->setReturnValue(returnValue);
+        return current(returnValue.GetIsolate()).setReturnValueFrom(returnValue, object);
+    }
+
+    static bool setReturnValueFast(v8::ReturnValue<v8::Value> returnValue, Node* node, v8::Local<v8::Object> holder, const ScriptWrappable* wrappable)
+    {
+        if (canUseScriptWrappable(node)
+            // The second fastest way to check if we're in the main world is to
+            // check if the wrappable's wrapper is the same as the holder.
+            || holderContainsWrapper(holder, wrappable))
+            return ScriptWrappable::fromNode(node)->setReturnValue(returnValue);
+        return current(returnValue.GetIsolate()).setReturnValueFrom(returnValue, ScriptWrappable::fromNode(node));
     }
 
     static v8::Handle<v8::Object> getWrapper(ScriptWrappable* object, v8::Isolate* isolate)
     {
         return current(isolate).get(object, isolate);
     }
 
     static v8::Handle<v8::Object> getWrapper(Node* node, v8::Isolate* isolate)
     {
         if (canUseScriptWrappable(node)) {
             v8::Handle<v8::Object> result = ScriptWrappable::fromNode(node)->newLocalWrapper(isolate);
             // Security: always guard against malicious tampering.
             ScriptWrappable::fromNode(node)->assertWrapperSanity(result);
             return result;
         }
         return current(isolate).get(ScriptWrappable::fromNode(node), isolate);
     }
 
-    static void setWrapperReference(const v8::Persistent<v8::Object>& parent, ScriptWrappableBase* child, v8::Isolate* isolate)
-    {
-        current(isolate).setReference(parent, child, isolate);
-    }
-
     static void setWrapperReference(const v8::Persistent<v8::Object>& parent, ScriptWrappable* child, v8::Isolate* isolate)
     {
         current(isolate).setReference(parent, child, isolate);
     }
 
     static void setWrapperReference(const v8::Persistent<v8::Object>& parent, Node* child, v8::Isolate* isolate)
     {
         if (canUseScriptWrappable(child)) {
             ScriptWrappable::fromNode(child)->setReference(parent, isolate);
             return;
         }
         current(isolate).setReference(parent, ScriptWrappable::fromNode(child), isolate);
     }
 
-    static void setWrapper(ScriptWrappableBase* object, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate, const WrapperTypeInfo* wrapperTypeInfo)
-    {
-        return current(isolate).set(object, wrapper, isolate, wrapperTypeInfo);
-    }
-
     static void setWrapper(ScriptWrappable* object, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate, const WrapperTypeInfo* wrapperTypeInfo)
     {
         return current(isolate).set(object, wrapper, isolate, wrapperTypeInfo);
     }
 
     static void setWrapper(Node* node, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate, const WrapperTypeInfo* wrapperTypeInfo)
     {
         if (canUseScriptWrappable(node)) {
             ScriptWrappable::fromNode(node)->setWrapper(wrapper, isolate, wrapperTypeInfo);
             return;
         }
         return current(isolate).set(ScriptWrappable::fromNode(node), wrapper, isolate, wrapperTypeInfo);
     }
 
-    static bool containsWrapper(ScriptWrappableBase* object, v8::Isolate* isolate)
-    {
-        return current(isolate).containsWrapper(object);
-    }
-
     static bool containsWrapper(ScriptWrappable* object, v8::Isolate* isolate)
     {
         return current(isolate).containsWrapper(object);
     }
 
-    v8::Handle<v8::Object> get(ScriptWrappableBase* object, v8::Isolate* isolate)
-    {
-        return m_wrapperMap.newLocal(object->toScriptWrappableBase(), isolate);
-    }
-
     v8::Handle<v8::Object> get(ScriptWrappable* object, v8::Isolate* isolate)
     {
         if (m_isMainWorld)
             return object->newLocalWrapper(isolate);
         return m_wrapperMap.newLocal(object->toScriptWrappableBase(), isolate);
     }
 
-    void setReference(const v8::Persistent<v8::Object>& parent, ScriptWrappableBase* child, v8::Isolate* isolate)
-    {
-        m_wrapperMap.setReference(parent, child, isolate);
-    }
-
     void setReference(const v8::Persistent<v8::Object>& parent, ScriptWrappable* child, v8::Isolate* isolate)
     {
         if (m_isMainWorld) {
             child->setReference(parent, isolate);
             return;
         }
         m_wrapperMap.setReference(parent, child->toScriptWrappableBase(), isolate);
     }
 
-    bool setReturnValueFrom(v8::ReturnValue<v8::Value> returnValue, ScriptWrappableBase* object)
-    {
-        return m_wrapperMap.setReturnValueFrom(returnValue, object);
-    }
-
     bool setReturnValueFrom(v8::ReturnValue<v8::Value> returnValue, ScriptWrappable* object)
     {
         if (m_isMainWorld)
             return object->setReturnValue(returnValue);
         return m_wrapperMap.setReturnValueFrom(returnValue, object->toScriptWrappableBase());
     }
 
-    bool containsWrapper(ScriptWrappableBase* object)
-    {
-        return m_wrapperMap.containsKey(object->toScriptWrappableBase());
-    }
-
     bool containsWrapper(ScriptWrappable* object)
     {
         if (m_isMainWorld)
             return object->containsWrapper();
         return m_wrapperMap.containsKey(object->toScriptWrappableBase());
     }
 
 private:
-    void set(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 set(ScriptWrappable* object, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate, const WrapperTypeInfo* wrapperTypeInfo)
     {
         ASSERT(object);
         ASSERT(!wrapper.IsEmpty());
         if (m_isMainWorld) {
             object->setWrapper(wrapper, isolate, wrapperTypeInfo);
             return;
         }
         m_wrapperMap.set(object->toScriptWrappableBase(), wrapper, wrapperTypeInfo);
     }
@@ skipping 32 matching lines @@
     v8::UniquePersistent<v8::Object> value,
     ScriptWrappableBase* key)
 {
     RELEASE_ASSERT(!value.IsEmpty()); // See crbug.com/368095.
     releaseObject(v8::Local<v8::Object>::New(isolate, value));
 }
 
 } // namespace blink
 
 #endif // DOMDataStore_h