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

Unified Diff: Source/core/layout/LayoutTable.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/LayoutTable.h ('k') | Source/core/layout/LayoutTableCell.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutTable.cpp
diff --git a/Source/core/layout/LayoutTable.cpp b/Source/core/layout/LayoutTable.cpp
index 01c1829685d41fc385a091da3a3b59f76ea39208..9c48813fb7f7c592ed5c5c940d0c93e50de6a08a 100644
--- a/Source/core/layout/LayoutTable.cpp
+++ b/Source/core/layout/LayoutTable.cpp
@@ -52,10 +52,10 @@ using namespace HTMLNames;
LayoutTable::LayoutTable(Element* element)
: LayoutBlock(element)
- , m_head(0)
- , m_foot(0)
- , m_firstBody(0)
- , m_currentBorder(0)
+ , m_head(nullptr)
+ , m_foot(nullptr)
+ , m_firstBody(nullptr)
+ , m_currentBorder(nullptr)
, m_collapsedBordersValid(false)
, m_hasColElements(false)
, m_needsSectionRecalc(false)
@@ -794,7 +794,7 @@ LayoutTableCol* LayoutTable::firstColumn() const
return toLayoutTableCol(child);
}
- return 0;
+ return nullptr;
}
void LayoutTable::updateColumnCache() const
@@ -834,16 +834,16 @@ LayoutTableCol* LayoutTable::slowColElement(unsigned col, bool* startEdge, bool*
return columnLayoutObject;
}
}
- return 0;
+ return nullptr;
}
void LayoutTable::recalcSections() const
{
ASSERT(m_needsSectionRecalc);
- m_head = 0;
- m_foot = 0;
- m_firstBody = 0;
+ m_head = nullptr;
+ m_foot = nullptr;
+ m_firstBody = nullptr;
m_hasColElements = false;
m_hasCellColspanThatDeterminesTableWidth = hasCellColspanThatDeterminesTableWidth();
@@ -1156,7 +1156,7 @@ LayoutTableSection* LayoutTable::sectionBelow(const LayoutTableSection* section,
recalcSectionsIfNeeded();
if (section == m_foot)
- return 0;
+ return nullptr;
LayoutObject* nextSection = section == m_head ? firstChild() : section->nextSibling();
while (nextSection) {
@@ -1181,7 +1181,7 @@ LayoutTableSection* LayoutTable::bottomSection() const
return toLayoutTableSection(child);
}
- return 0;
+ return nullptr;
}
LayoutTableCell* LayoutTable::cellAbove(const LayoutTableCell* cell) const
@@ -1190,7 +1190,7 @@ LayoutTableCell* LayoutTable::cellAbove(const LayoutTableCell* cell) const
// Find the section and row to look in
unsigned r = cell->rowIndex();
- LayoutTableSection* section = 0;
+ LayoutTableSection* section = nullptr;
unsigned rAbove = 0;
if (r > 0) {
// cell is not in the first row, so use the above row in its own section
@@ -1210,7 +1210,7 @@ LayoutTableCell* LayoutTable::cellAbove(const LayoutTableCell* cell) const
LayoutTableSection::CellStruct& aboveCell = section->cellAt(rAbove, effCol);
return aboveCell.primaryCell();
}
- return 0;
+ return nullptr;
}
LayoutTableCell* LayoutTable::cellBelow(const LayoutTableCell* cell) const
@@ -1219,7 +1219,7 @@ LayoutTableCell* LayoutTable::cellBelow(const LayoutTableCell* cell) const
// Find the section and row to look in
unsigned r = cell->rowIndex() + cell->rowSpan() - 1;
- LayoutTableSection* section = 0;
+ LayoutTableSection* section = nullptr;
unsigned rBelow = 0;
if (r < cell->section()->numRows() - 1) {
// The cell is not in the last row, so use the next row in the section.
@@ -1237,7 +1237,7 @@ LayoutTableCell* LayoutTable::cellBelow(const LayoutTableCell* cell) const
LayoutTableSection::CellStruct& belowCell = section->cellAt(rBelow, effCol);
return belowCell.primaryCell();
}
- return 0;
+ return nullptr;
}
LayoutTableCell* LayoutTable::cellBefore(const LayoutTableCell* cell) const
@@ -1247,7 +1247,7 @@ LayoutTableCell* LayoutTable::cellBefore(const LayoutTableCell* cell) const
LayoutTableSection* section = cell->section();
unsigned effCol = colToEffCol(cell->col());
if (!effCol)
- return 0;
+ return nullptr;
// If we hit a colspan back up to a real cell.
LayoutTableSection::CellStruct& prevCell = section->cellAt(cell->rowIndex(), effCol - 1);
@@ -1260,7 +1260,7 @@ LayoutTableCell* LayoutTable::cellAfter(const LayoutTableCell* cell) const
unsigned effCol = colToEffCol(cell->col() + cell->colSpan());
if (effCol >= numEffCols())
- return 0;
+ return nullptr;
return cell->section()->primaryCellAt(cell->rowIndex(), effCol);
}
@@ -1364,7 +1364,7 @@ bool LayoutTable::nodeAtPoint(HitTestResult& result, const HitTestLocation& loca
LayoutTable* LayoutTable::createAnonymousWithParent(const LayoutObject* parent)
{
RefPtr<ComputedStyle> newStyle = ComputedStyle::createAnonymousStyleWithDisplay(parent->styleRef(), TABLE);
- LayoutTable* newTable = new LayoutTable(0);
+ LayoutTable* newTable = new LayoutTable(nullptr);
newTable->setDocumentForAnonymous(&parent->document());
newTable->setStyle(newStyle.release());
return newTable;
« no previous file with comments | « Source/core/layout/LayoutTable.h ('k') | Source/core/layout/LayoutTableCell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698