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

Unified Diff: Source/core/layout/LayoutMultiColumnFlowThreadTest.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/LayoutMultiColumnFlowThread.cpp ('k') | Source/core/layout/LayoutMultiColumnSet.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutMultiColumnFlowThreadTest.cpp
diff --git a/Source/core/layout/LayoutMultiColumnFlowThreadTest.cpp b/Source/core/layout/LayoutMultiColumnFlowThreadTest.cpp
index 8650f50121f7052798f8533f98a0f5a384918d5e..65e2abf80a7cbce95792d9fa0615519778ccf029 100644
--- a/Source/core/layout/LayoutMultiColumnFlowThreadTest.cpp
+++ b/Source/core/layout/LayoutMultiColumnFlowThreadTest.cpp
@@ -33,10 +33,10 @@ LayoutMultiColumnFlowThread* MultiColumnRenderingTest::findFlowThread(const char
{
Node* multicol = document().getElementById(id);
if (!multicol)
- return 0;
+ return nullptr;
LayoutBlockFlow* multicolContainer = toLayoutBlockFlow(multicol->layoutObject());
if (!multicolContainer)
- return 0;
+ return nullptr;
return multicolContainer->multiColumnFlowThread();
}
@@ -344,7 +344,7 @@ TEST_F(MultiColumnRenderingTest, columnSetAtBlockOffsetVerticalLr)
class MultiColumnTreeModifyingTest : public MultiColumnRenderingTest {
public:
void setMulticolHTML(const char*);
- void reparentLayoutObject(const char* newParentId, const char* childId, const char* insertBeforeId = 0);
+ void reparentLayoutObject(const char* newParentId, const char* childId, const char* insertBeforeId = nullptr);
void destroyLayoutObject(LayoutObject* child);
void destroyLayoutObject(const char* childId);
};
@@ -360,7 +360,7 @@ void MultiColumnTreeModifyingTest::reparentLayoutObject(const char* newParentId,
{
LayoutObject* newParent = document().getElementById(newParentId)->layoutObject();
LayoutObject* child = document().getElementById(childId)->layoutObject();
- LayoutObject* insertBefore = insertBeforeId ? document().getElementById(insertBeforeId)->layoutObject() : 0;
+ LayoutObject* insertBefore = insertBeforeId ? document().getElementById(insertBeforeId)->layoutObject() : nullptr;
child->remove();
newParent->addChild(child, insertBefore);
}
« no previous file with comments | « Source/core/layout/LayoutMultiColumnFlowThread.cpp ('k') | Source/core/layout/LayoutMultiColumnSet.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698