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 d59c8170970c2fb28bdc8fc58c94c931b261100f..0f26be51de02d754b54215a4071b378b4d60a58d 100644 |
--- a/third_party/WebKit/Source/web/WebFrame.cpp |
+++ b/third_party/WebKit/Source/web/WebFrame.cpp |
@@ -291,16 +291,6 @@ WebFrame::~WebFrame() { |
m_openedFrameTracker.reset(0); |
} |
-ALWAYS_INLINE bool WebFrame::isFrameAlive(const WebFrame* frame) { |
- if (!frame) |
- return true; |
- |
- if (frame->isWebLocalFrame()) |
- return ThreadHeap::isHeapObjectAlive(toWebLocalFrameImpl(frame)); |
- |
- return ThreadHeap::isHeapObjectAlive(toWebRemoteFrameImpl(frame)); |
-} |
- |
void WebFrame::traceFrame(Visitor* visitor, WebFrame* frame) { |
if (!frame) |
return; |
@@ -317,13 +307,10 @@ void WebFrame::traceFrames(Visitor* visitor, WebFrame* frame) { |
for (WebFrame* child = frame->firstChild(); child; |
child = child->nextSibling()) |
traceFrame(visitor, child); |
- // m_opener is a weak reference. |
- frame->m_openedFrameTracker->traceFrames(visitor); |
} |
-void WebFrame::clearWeakFrames(Visitor* visitor) { |
- if (!isFrameAlive(m_opener)) |
- m_opener = nullptr; |
+void WebFrame::close() { |
+ m_openedFrameTracker->dispose(); |
} |
} // namespace blink |