Index: third_party/WebKit/Source/web/WebFrame.cpp |
diff --git a/third_party/WebKit/Source/web/WebFrame.cpp b/third_party/WebKit/Source/web/WebFrame.cpp |
index 61f14303e0c06ff1774cf19ecf7ab920ab88fc27..8824207cccb325a9f39e3e65392f1936e7adf112 100644 |
--- a/third_party/WebKit/Source/web/WebFrame.cpp |
+++ b/third_party/WebKit/Source/web/WebFrame.cpp |
@@ -300,9 +300,7 @@ ALWAYS_INLINE bool WebFrame::isFrameAlive(const WebFrame* frame) { |
return ThreadHeap::isHeapObjectAlive(toWebRemoteFrameImpl(frame)); |
} |
-template <typename VisitorDispatcher> |
-ALWAYS_INLINE void WebFrame::traceFrameImpl(VisitorDispatcher visitor, |
- WebFrame* frame) { |
+void WebFrame::traceFrame(Visitor* visitor, WebFrame* frame) { |
if (!frame) |
return; |
@@ -312,9 +310,7 @@ ALWAYS_INLINE void WebFrame::traceFrameImpl(VisitorDispatcher visitor, |
visitor->trace(toWebRemoteFrameImpl(frame)); |
} |
-template <typename VisitorDispatcher> |
-ALWAYS_INLINE void WebFrame::traceFramesImpl(VisitorDispatcher visitor, |
- WebFrame* frame) { |
+void WebFrame::traceFrames(Visitor* visitor, WebFrame* frame) { |
DCHECK(frame); |
traceFrame(visitor, frame->m_parent); |
for (WebFrame* child = frame->firstChild(); child; |
@@ -324,25 +320,9 @@ ALWAYS_INLINE void WebFrame::traceFramesImpl(VisitorDispatcher visitor, |
frame->m_openedFrameTracker->traceFrames(visitor); |
} |
-template <typename VisitorDispatcher> |
-ALWAYS_INLINE void WebFrame::clearWeakFramesImpl(VisitorDispatcher visitor) { |
+void WebFrame::clearWeakFrames(Visitor* visitor) { |
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); \ |
- } \ |
- void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { \ |
- clearWeakFramesImpl(visitor); \ |
- } |
- |
-DEFINE_VISITOR_METHOD(Visitor*) |
- |
-#undef DEFINE_VISITOR_METHOD |
- |
} // namespace blink |