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

Unified Diff: Source/core/layout/LayoutBlockFlow.cpp

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/LayoutBlockFlow.h ('k') | Source/core/layout/LayoutBlockFlowLine.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutBlockFlow.cpp
diff --git a/Source/core/layout/LayoutBlockFlow.cpp b/Source/core/layout/LayoutBlockFlow.cpp
index 3a221f7a5f242115be8f700535e67436b70f34a8..d5573601058099b661f2c1587db775a05f28f77d 100644
--- a/Source/core/layout/LayoutBlockFlow.cpp
+++ b/Source/core/layout/LayoutBlockFlow.cpp
@@ -175,7 +175,7 @@ LayoutBlockFlow::~LayoutBlockFlow()
LayoutBlockFlow* LayoutBlockFlow::createAnonymous(Document* document)
{
- LayoutBlockFlow* layoutBlockFlow = new LayoutBlockFlow(0);
+ LayoutBlockFlow* layoutBlockFlow = new LayoutBlockFlow(nullptr);
layoutBlockFlow->setDocumentForAnonymous(document);
return layoutBlockFlow;
}
@@ -184,7 +184,7 @@ LayoutObject* LayoutBlockFlow::layoutSpecialExcludedChild(bool relayoutChildren,
{
LayoutMultiColumnFlowThread* flowThread = multiColumnFlowThread();
if (!flowThread)
- return 0;
+ return nullptr;
setLogicalTopForChild(*flowThread, borderBefore() + paddingBefore());
flowThread->layoutColumns(relayoutChildren, layoutScope);
determineLogicalLeftPositionForChild(*flowThread);
@@ -954,7 +954,7 @@ void LayoutBlockFlow::layoutBlockChildren(bool relayoutChildren, SubtreeLayoutSc
LayoutUnit previousFloatLogicalBottom = 0;
LayoutBox* next = firstChildBox();
- LayoutBox* lastNormalFlowChild = 0;
+ LayoutBox* lastNormalFlowChild = nullptr;
while (next) {
LayoutBox* child = next;
@@ -2271,7 +2271,7 @@ void LayoutBlockFlow::removeFloatingObject(LayoutBox* floatBox)
floatingObject->originatingLine()->markDirty();
}
#if ENABLE(ASSERT)
- floatingObject->setOriginatingLine(0);
+ floatingObject->setOriginatingLine(nullptr);
#endif
}
markLinesDirtyInBlockRange(0, logicalBottom);
@@ -2315,7 +2315,7 @@ bool LayoutBlockFlow::positionNewFloats(LineWidth* width)
FloatingObjectSetIterator it = floatingObjectSet.end();
--it; // Go to last item.
FloatingObjectSetIterator begin = floatingObjectSet.begin();
- FloatingObject* lastPlacedFloatingObject = 0;
+ FloatingObject* lastPlacedFloatingObject = nullptr;
while (it != begin) {
--it;
if ((*it)->isPlaced()) {
@@ -2693,7 +2693,7 @@ GapRects LayoutBlockFlow::inlineSelectionGaps(const LayoutBlock* rootBlock, cons
return result;
}
- RootInlineBox* lastSelectedLine = 0;
+ RootInlineBox* lastSelectedLine = nullptr;
RootInlineBox* curr;
for (curr = firstRootBox(); curr && !curr->hasSelectedChildren(); curr = curr->nextRootBox()) { }
« no previous file with comments | « Source/core/layout/LayoutBlockFlow.h ('k') | Source/core/layout/LayoutBlockFlowLine.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698