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

Unified Diff: Source/core/layout/LayoutMultiColumnFlowThread.h

Issue 1162383003: C++11: Replace 0 with nullptr where applicable in layout code. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add one more file. Created 5 years, 6 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/layout/LayoutMenuList.h ('k') | Source/core/layout/LayoutMultiColumnFlowThread.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutMultiColumnFlowThread.h
diff --git a/Source/core/layout/LayoutMultiColumnFlowThread.h b/Source/core/layout/LayoutMultiColumnFlowThread.h
index 9701d6979cb663c53576b5e831aa8b1618661e35..42b4a6eb14826955358316e2cff9ca016cece58f 100644
--- a/Source/core/layout/LayoutMultiColumnFlowThread.h
+++ b/Source/core/layout/LayoutMultiColumnFlowThread.h
@@ -188,8 +188,8 @@ protected:
private:
void calculateColumnCountAndWidth(LayoutUnit& width, unsigned& count) const;
- void createAndInsertMultiColumnSet(LayoutBox* insertBefore = 0);
- void createAndInsertSpannerPlaceholder(LayoutBox* spanner, LayoutBox* insertBefore = 0);
+ void createAndInsertMultiColumnSet(LayoutBox* insertBefore = nullptr);
+ void createAndInsertSpannerPlaceholder(LayoutBox* spanner, LayoutBox* insertBefore = nullptr);
virtual bool descendantIsValidColumnSpanner(LayoutObject* descendant) const;
virtual void addColumnSetToThread(LayoutMultiColumnSet*) override;
@@ -204,7 +204,7 @@ private:
virtual void updateLogicalWidth() override;
virtual void setPageBreak(LayoutUnit offset, LayoutUnit spaceShortage) override;
virtual void updateMinimumPageHeight(LayoutUnit offset, LayoutUnit minHeight) override;
- virtual bool addForcedColumnBreak(LayoutUnit, LayoutObject* breakChild, bool isBefore, LayoutUnit* offsetBreakAdjustment = 0) override;
+ virtual bool addForcedColumnBreak(LayoutUnit, LayoutObject* breakChild, bool isBefore, LayoutUnit* offsetBreakAdjustment = nullptr) override;
virtual bool isPageLogicalHeightKnown() const override;
// The last set we worked on. It's not to be used as the "current set". The concept of a
« no previous file with comments | « Source/core/layout/LayoutMenuList.h ('k') | Source/core/layout/LayoutMultiColumnFlowThread.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698