| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "public/web/WebFrame.h" | 5 #include "public/web/WebFrame.h" |
| 6 | 6 |
| 7 #include "bindings/core/v8/WindowProxyManager.h" | 7 #include "bindings/core/v8/WindowProxyManager.h" |
| 8 #include "core/frame/FrameHost.h" | 8 #include "core/frame/FrameHost.h" |
| 9 #include "core/frame/FrameView.h" | 9 #include "core/frame/FrameView.h" |
| 10 #include "core/frame/LocalFrame.h" | 10 #include "core/frame/LocalFrame.h" |
| (...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 317 m_openedFrameTracker.reset(0); | 317 m_openedFrameTracker.reset(0); |
| 318 } | 318 } |
| 319 | 319 |
| 320 #if ENABLE(OILPAN) | 320 #if ENABLE(OILPAN) |
| 321 ALWAYS_INLINE bool WebFrame::isFrameAlive(const WebFrame* frame) | 321 ALWAYS_INLINE bool WebFrame::isFrameAlive(const WebFrame* frame) |
| 322 { | 322 { |
| 323 if (!frame) | 323 if (!frame) |
| 324 return true; | 324 return true; |
| 325 | 325 |
| 326 if (frame->isWebLocalFrame()) | 326 if (frame->isWebLocalFrame()) |
| 327 return Heap::isHeapObjectAlive(toWebLocalFrameImpl(frame)); | 327 return ThreadHeap::isHeapObjectAlive(toWebLocalFrameImpl(frame)); |
| 328 | 328 |
| 329 return Heap::isHeapObjectAlive(toWebRemoteFrameImpl(frame)); | 329 return ThreadHeap::isHeapObjectAlive(toWebRemoteFrameImpl(frame)); |
| 330 } | 330 } |
| 331 | 331 |
| 332 template <typename VisitorDispatcher> | 332 template <typename VisitorDispatcher> |
| 333 ALWAYS_INLINE void WebFrame::traceFrameImpl(VisitorDispatcher visitor, WebFrame*
frame) | 333 ALWAYS_INLINE void WebFrame::traceFrameImpl(VisitorDispatcher visitor, WebFrame*
frame) |
| 334 { | 334 { |
| 335 if (!frame) | 335 if (!frame) |
| 336 return; | 336 return; |
| 337 | 337 |
| 338 if (frame->isWebLocalFrame()) | 338 if (frame->isWebLocalFrame()) |
| 339 visitor->trace(toWebLocalFrameImpl(frame)); | 339 visitor->trace(toWebLocalFrameImpl(frame)); |
| (...skipping 24 matching lines...) Expand all Loading... |
| 364 void WebFrame::traceFrames(VisitorDispatcher visitor, WebFrame* frame) { tra
ceFramesImpl(visitor, frame); } \ | 364 void WebFrame::traceFrames(VisitorDispatcher visitor, WebFrame* frame) { tra
ceFramesImpl(visitor, frame); } \ |
| 365 void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { clearWeakFramesI
mpl(visitor); } | 365 void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { clearWeakFramesI
mpl(visitor); } |
| 366 | 366 |
| 367 DEFINE_VISITOR_METHOD(Visitor*) | 367 DEFINE_VISITOR_METHOD(Visitor*) |
| 368 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor) | 368 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor) |
| 369 | 369 |
| 370 #undef DEFINE_VISITOR_METHOD | 370 #undef DEFINE_VISITOR_METHOD |
| 371 #endif | 371 #endif |
| 372 | 372 |
| 373 } // namespace blink | 373 } // namespace blink |
| OLD | NEW |