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

Unified Diff: Source/core/frame/FrameView.cpp

Issue 423093002: Oilpan: Prepare to move RenderObject and RenderObjectChildList to Oilpan heap. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: dispose -> destroy Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/frame/FrameView.h ('k') | Source/core/rendering/RenderBlock.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/FrameView.cpp
diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
index 8b945c4cc51a9792097e8b5ef9f94ef3562bfa09..055dc003990c16754a31d390ba5aa50fb153c637 100644
--- a/Source/core/frame/FrameView.cpp
+++ b/Source/core/frame/FrameView.cpp
@@ -112,7 +112,7 @@ FrameView::FrameView(LocalFrame* frame)
, m_inProgrammaticScroll(false)
, m_safeToPropagateScrollToParent(true)
, m_isTrackingPaintInvalidations(false)
- , m_scrollCorner(0)
+ , m_scrollCorner(nullptr)
, m_shouldAutoSize(false)
, m_inAutoSize(false)
, m_didRunAutosize(false)
@@ -274,7 +274,7 @@ void FrameView::detachCustomScrollbars()
if (m_scrollCorner) {
m_scrollCorner->destroy();
- m_scrollCorner = 0;
+ m_scrollCorner = nullptr;
}
}
@@ -1059,7 +1059,7 @@ void FrameView::removeWidget(RenderWidget* object)
void FrameView::updateWidgetPositions()
{
- Vector<RefPtr<RenderWidget> > widgets;
+ WillBeHeapVector<RefPtrWillBeMember<RenderWidget> > widgets;
copyToVector(m_widgets, widgets);
// Script or plugins could detach the frame so abort processing if that happens.
@@ -2422,7 +2422,7 @@ void FrameView::updateScrollCorner()
invalidateScrollCorner(cornerRect);
} else if (m_scrollCorner) {
m_scrollCorner->destroy();
- m_scrollCorner = 0;
+ m_scrollCorner = nullptr;
}
ScrollView::updateScrollCorner();
« no previous file with comments | « Source/core/frame/FrameView.h ('k') | Source/core/rendering/RenderBlock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698