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

Unified Diff: Source/core/rendering/RenderLayerScrollableArea.cpp

Issue 423093002: Oilpan: Prepare to move RenderObject and RenderObjectChildList to Oilpan heap. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: add more trace Created 6 years, 5 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
Index: Source/core/rendering/RenderLayerScrollableArea.cpp
diff --git a/Source/core/rendering/RenderLayerScrollableArea.cpp b/Source/core/rendering/RenderLayerScrollableArea.cpp
index 62d2aa6a6c2d9ad5676a362d7c4678171f49636d..69f2d41816783f4d8c23dbbb87cb513cad45c91c 100644
--- a/Source/core/rendering/RenderLayerScrollableArea.cpp
+++ b/Source/core/rendering/RenderLayerScrollableArea.cpp
@@ -85,8 +85,8 @@ RenderLayerScrollableArea::RenderLayerScrollableArea(RenderLayer& layer)
, m_nextTopmostScrollChild(0)
, m_topmostScrollChild(0)
, m_needsCompositedScrolling(false)
- , m_scrollCorner(0)
- , m_resizer(0)
+ , m_scrollCorner(nullptr)
+ , m_resizer(nullptr)
{
ScrollableArea::setConstrainsScrollingToContentEdge(false);
@@ -977,7 +977,7 @@ void RenderLayerScrollableArea::updateScrollCornerStyle()
m_scrollCorner->setStyle(corner.release());
} else if (m_scrollCorner) {
m_scrollCorner->destroy();
- m_scrollCorner = 0;
+ m_scrollCorner = nullptr;
}
}
@@ -1245,7 +1245,7 @@ void RenderLayerScrollableArea::updateResizerStyle()
m_resizer->setStyle(resizer.release());
} else if (m_resizer) {
m_resizer->destroy();
- m_resizer = 0;
+ m_resizer = nullptr;
}
}

Powered by Google App Engine
This is Rietveld 408576698