Merge VisitorScope to Visitor

third_party/WebKit/Source/platform/heap/Visitor.h

Index: third_party/WebKit/Source/platform/heap/Visitor.h
diff --git a/third_party/WebKit/Source/platform/heap/Visitor.h b/third_party/WebKit/Source/platform/heap/Visitor.h
index 443db172a7ead4857fe943db6881ba5ca5b2d90c..93164e4107d7b6b65b2014dd9853bac934ec38b5 100644
--- a/third_party/WebKit/Source/platform/heap/Visitor.h
+++ b/third_party/WebKit/Source/platform/heap/Visitor.h
@@ -317,7 +317,9 @@ public:
         WeakProcessing,
     };
 
-    virtual ~Visitor() { }
+    static PassOwnPtr<Visitor> create(ThreadState*, BlinkGC::GCType);
+
+    virtual ~Visitor();
 
     using VisitorHelper<Visitor>::mark;
 
@@ -374,31 +376,18 @@ public:
     inline MarkingMode markingMode() const { return m_markingMode; }
 
 protected:
-    explicit Visitor(MarkingMode markingMode)
-        : m_markingMode(markingMode)
-    { }
+    Visitor(ThreadState*, MarkingMode);
 
     virtual void registerWeakCellWithCallback(void**, WeakCallback) = 0;
 
 private:
     static Visitor* fromHelper(VisitorHelper<Visitor>* helper) { return static_cast<Visitor*>(helper); }
 
+    ThreadState* m_state;
     const MarkingMode m_markingMode;
     bool m_isGlobalMarkingVisitor;
 };
 
-class VisitorScope final {
-    STACK_ALLOCATED();
-public:
-    VisitorScope(ThreadState*, BlinkGC::GCType);
-    ~VisitorScope();
-    Visitor* visitor() const { return m_visitor.get(); }
-
-private:
-    ThreadState* m_state;
-    OwnPtr<Visitor> m_visitor;
-};
-
 } // namespace blink
 
 #endif // Visitor_h