Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(115)

Side by Side Diff: third_party/WebKit/Source/web/WebFrame.cpp

Issue 1845543002: Rename Heap to ThreadHeap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 { 306 {
307 m_openedFrameTracker.reset(0); 307 m_openedFrameTracker.reset(0);
308 } 308 }
309 309
310 ALWAYS_INLINE bool WebFrame::isFrameAlive(const WebFrame* frame) 310 ALWAYS_INLINE bool WebFrame::isFrameAlive(const WebFrame* frame)
311 { 311 {
312 if (!frame) 312 if (!frame)
313 return true; 313 return true;
314 314
315 if (frame->isWebLocalFrame()) 315 if (frame->isWebLocalFrame())
316 return Heap::isHeapObjectAlive(toWebLocalFrameImpl(frame)); 316 return ThreadHeap::isHeapObjectAlive(toWebLocalFrameImpl(frame));
317 317
318 return Heap::isHeapObjectAlive(toWebRemoteFrameImpl(frame)); 318 return ThreadHeap::isHeapObjectAlive(toWebRemoteFrameImpl(frame));
319 } 319 }
320 320
321 template <typename VisitorDispatcher> 321 template <typename VisitorDispatcher>
322 ALWAYS_INLINE void WebFrame::traceFrameImpl(VisitorDispatcher visitor, WebFrame* frame) 322 ALWAYS_INLINE void WebFrame::traceFrameImpl(VisitorDispatcher visitor, WebFrame* frame)
323 { 323 {
324 if (!frame) 324 if (!frame)
325 return; 325 return;
326 326
327 if (frame->isWebLocalFrame()) 327 if (frame->isWebLocalFrame())
328 visitor->trace(toWebLocalFrameImpl(frame)); 328 visitor->trace(toWebLocalFrameImpl(frame));
(...skipping 23 matching lines...) Expand all
352 void WebFrame::traceFrame(VisitorDispatcher visitor, WebFrame* frame) { trac eFrameImpl(visitor, frame); } \ 352 void WebFrame::traceFrame(VisitorDispatcher visitor, WebFrame* frame) { trac eFrameImpl(visitor, frame); } \
353 void WebFrame::traceFrames(VisitorDispatcher visitor, WebFrame* frame) { tra ceFramesImpl(visitor, frame); } \ 353 void WebFrame::traceFrames(VisitorDispatcher visitor, WebFrame* frame) { tra ceFramesImpl(visitor, frame); } \
354 void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { clearWeakFramesI mpl(visitor); } 354 void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { clearWeakFramesI mpl(visitor); }
355 355
356 DEFINE_VISITOR_METHOD(Visitor*) 356 DEFINE_VISITOR_METHOD(Visitor*)
357 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor) 357 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor)
358 358
359 #undef DEFINE_VISITOR_METHOD 359 #undef DEFINE_VISITOR_METHOD
360 360
361 } // namespace blink 361 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/testing/RunAllTests.cpp ('k') | third_party/WebKit/Source/web/WebHeap.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698