Oilpan: Remove a visitor parameter from isHeapObjectAlive

Source/web/WebFrame.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "public/web/WebFrame.h"
 
 #include "bindings/core/v8/WindowProxyManager.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
@@ skipping 279 matching lines @@
     , m_openedFrameTracker(new OpenedFrameTracker)
 {
 }
 
 WebFrame::~WebFrame()
 {
     m_openedFrameTracker.reset(0);
 }
 
 #if ENABLE(OILPAN)
+ALWAYS_INLINE bool WebFrame::isFrameAlive(const WebFrame* frame)
+{
+    if (!frame)
+        return true;
+
+    if (frame->isWebLocalFrame())
+        return Heap::isHeapObjectAlive(toWebLocalFrameImpl(frame));
+
+    return Heap::isHeapObjectAlive(toWebRemoteFrameImpl(frame));
+}
+
 template <typename VisitorDispatcher>
 ALWAYS_INLINE void WebFrame::traceFrameImpl(VisitorDispatcher visitor, WebFrame* frame)
 {
     if (!frame)
         return;
 
     if (frame->isWebLocalFrame())
         visitor->trace(toWebLocalFrameImpl(frame));
     else
         visitor->trace(toWebRemoteFrameImpl(frame));
 }
 
 template <typename VisitorDispatcher>
 ALWAYS_INLINE void WebFrame::traceFramesImpl(VisitorDispatcher visitor, WebFrame* frame)
 {
     ASSERT(frame);
     traceFrame(visitor, frame->m_parent);
     for (WebFrame* child = frame->firstChild(); child; child = child->nextSibling())
         traceFrame(visitor, child);
     // m_opener is a weak reference.
     frame->m_openedFrameTracker->traceFrames(visitor);
 }
 
 template <typename VisitorDispatcher>
-ALWAYS_INLINE bool WebFrame::isFrameAliveImpl(VisitorDispatcher visitor, const WebFrame* frame)
-{
-    if (!frame)
-        return true;
-
-    if (frame->isWebLocalFrame())
-        return visitor->isHeapObjectAlive(toWebLocalFrameImpl(frame));
-
-    return visitor->isHeapObjectAlive(toWebRemoteFrameImpl(frame));
-}
-
-template <typename VisitorDispatcher>
 ALWAYS_INLINE void WebFrame::clearWeakFramesImpl(VisitorDispatcher visitor)
 {
-    if (!isFrameAlive(visitor, m_opener))
+    if (!isFrameAlive(m_opener))
         m_opener = nullptr;
 }
 
 #define DEFINE_VISITOR_METHOD(VisitorDispatcher)                                                                               \
     void WebFrame::traceFrame(VisitorDispatcher visitor, WebFrame* frame) { traceFrameImpl(visitor, frame); }                  \
     void WebFrame::traceFrames(VisitorDispatcher visitor, WebFrame* frame) { traceFramesImpl(visitor, frame); }                \
-    bool WebFrame::isFrameAlive(VisitorDispatcher visitor, const WebFrame* frame) { return isFrameAliveImpl(visitor, frame); } \
     void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { clearWeakFramesImpl(visitor); }
 
 DEFINE_VISITOR_METHOD(Visitor*)
 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor)
 
 #undef DEFINE_VISITOR_METHOD
 #endif
 
 } // namespace blink