Blink side changes to toggle between the old and new GC visitor API.

Source/bindings/v8/V8GCController.cpp

 /*
  * 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 91 matching lines @@
 // Regarding a minor GC algorithm for DOM nodes, see this document:
 // https://docs.google.com/a/google.com/presentation/d/1uifwVYGNYTZDoGLyCb7sXa7g49mWNMW2gaWvMN5NLk8/edit#slide=id.p
 class MinorGCWrapperVisitor : public v8::PersistentHandleVisitor {
 public:
     explicit MinorGCWrapperVisitor(v8::Isolate* isolate)
         : m_isolate(isolate)
     {
         UNUSED_PARAM(m_isolate);
     }
 
+#ifdef V8_USE_OLD_STYLE_PERSISTENT_HANDLE_VISITORS
     virtual void VisitPersistentHandle(v8::Persistent<v8::Value> value, uint16_t classId) OVERRIDE
     {
+        VisitPersistentHandle(&value, classId);
+    }
+
+    virtual void VisitPersistentHandle(v8::Persistent<v8::Value>* value, uint16_t classId)
+#else
+    virtual void VisitPersistentHandle(v8::Persistent<v8::Value>* value, uint16_t classId) OVERRIDE
+#endif
+    {
         // A minor DOM GC can collect only Nodes.
         if (classId != v8DOMNodeClassId)
             return;
 
         // To make minor GC cycle time bounded, we limit the number of wrappers handled
         // by each minor GC cycle to 10000. This value was selected so that the minor
         // GC cycle time is bounded to 20 ms in a case where the new space size
         // is 16 MB and it is full of wrappers (which is almost the worst case).
         // Practically speaking, as far as I crawled real web applications,
         // the number of wrappers handled by each minor GC cycle is at most 3000.
         // So this limit is mainly for pathological micro benchmarks.
         const unsigned wrappersHandledByEachMinorGC = 10000;
         if (m_nodesInNewSpace.size() >= wrappersHandledByEachMinorGC)
             return;
 
-        ASSERT(value->IsObject());
+        ASSERT((*value)->IsObject());
 #ifdef V8_USE_UNSAFE_HANDLES
-        v8::Persistent<v8::Object> wrapper = v8::Persistent<v8::Object>::Cast(value);
+        v8::Persistent<v8::Object> wrapper = v8::Persistent<v8::Object>::Cast(*value);
 #else
-        v8::Persistent<v8::Object>& wrapper = v8::Persistent<v8::Object>::Cast(value);
+        v8::Persistent<v8::Object>& wrapper = v8::Persistent<v8::Object>::Cast(*value);
 #endif
-        ASSERT(V8DOMWrapper::maybeDOMWrapper(value));
+        ASSERT(V8DOMWrapper::maybeDOMWrapper(*value));
         ASSERT(V8Node::HasInstanceInAnyWorld(wrapper, m_isolate));
         Node* node = V8Node::toNative(wrapper);
         // A minor DOM GC can handle only node wrappers in the main world.
         // Note that node->wrapper().IsEmpty() returns true for nodes that
         // do not have wrappers in the main world.
         if (node->containsWrapper()) {
             WrapperTypeInfo* type = toWrapperTypeInfo(wrapper);
             ActiveDOMObject* activeDOMObject = type->toActiveDOMObject(wrapper);
             if (activeDOMObject && activeDOMObject->hasPendingActivity())
                 return;
@@ skipping 85 matching lines @@
 
 class MajorGCWrapperVisitor : public v8::PersistentHandleVisitor {
 public:
     explicit MajorGCWrapperVisitor(v8::Isolate* isolate, bool constructRetainedObjectInfos)
         : m_isolate(isolate)
         , m_liveRootGroupIdSet(false)
         , m_constructRetainedObjectInfos(constructRetainedObjectInfos)
     {
     }
 
+#ifdef V8_USE_OLD_STYLE_PERSISTENT_HANDLE_VISITORS
     virtual void VisitPersistentHandle(v8::Persistent<v8::Value> value, uint16_t classId) OVERRIDE
     {
-        ASSERT(value->IsObject());
+        VisitPersistentHandle(&value, classId);
+    }
+
+    virtual void VisitPersistentHandle(v8::Persistent<v8::Value>* value, uint16_t classId)
+#else
+    virtual void VisitPersistentHandle(v8::Persistent<v8::Value>* value, uint16_t classId) OVERRIDE
+#endif
+    {
+        ASSERT((*value)->IsObject());
 #ifdef V8_USE_UNSAFE_HANDLES
-        v8::Persistent<v8::Object> wrapper = v8::Persistent<v8::Object>::Cast(value);
+        v8::Persistent<v8::Object> wrapper = v8::Persistent<v8::Object>::Cast(*value);
 #else
-        v8::Persistent<v8::Object>& wrapper = v8::Persistent<v8::Object>::Cast(value);
+        v8::Persistent<v8::Object>& wrapper = v8::Persistent<v8::Object>::Cast(*value);
 #endif
 
         if (classId != v8DOMNodeClassId && classId != v8DOMObjectClassId)
             return;
 
-        ASSERT(V8DOMWrapper::maybeDOMWrapper(value));
+        ASSERT(V8DOMWrapper::maybeDOMWrapper(*value));
 
-        if (value.IsIndependent(m_isolate))
+        if (value->IsIndependent(m_isolate))
             return;
 
         WrapperTypeInfo* type = toWrapperTypeInfo(wrapper);
         void* object = toNative(wrapper);
 
         if (V8MessagePort::info.equals(type)) {
             // Mark each port as in-use if it's entangled. For simplicity's sake,
             // we assume all ports are remotely entangled, since the Chromium port
             // implementation can't tell the difference.
             MessagePort* port = static_cast<MessagePort*>(object);
@@ skipping 178 matching lines @@
     v8::V8::IdleNotification(longIdlePauseInMS);
 }
 
 void V8GCController::collectGarbage(v8::Isolate* isolate)
 {
     v8::HandleScope handleScope(isolate);
     V8ScriptRunner::compileAndRunInternalScript(v8String("if (gc) gc();", isolate), isolate);
 }
 
 }  // namespace WebCore