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

Unified Diff: src/views/SkStackViewLayout.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 4 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 | « src/views/SkProgressView.cpp ('k') | src/views/SkTagList.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/views/SkStackViewLayout.cpp
diff --git a/src/views/SkStackViewLayout.cpp b/src/views/SkStackViewLayout.cpp
index aba6f2e93a25c198c39b3247a4db90ec19094b02..b0c8c8ce02333c87b5117777c9efe3c0d406ca9e 100644
--- a/src/views/SkStackViewLayout.cpp
+++ b/src/views/SkStackViewLayout.cpp
@@ -79,7 +79,7 @@ static SkScalar compute_children_limit(SkView* parent, GetSizeProc sizeProc, int
SkScalar limit = 0;
int n = 0, flex = 0;
- while ((child = iter.next()) != NULL)
+ while ((child = iter.next()) != nullptr)
{
n += 1;
if (child->getFlags() & flexMask)
@@ -145,7 +145,7 @@ void SkStackViewLayout::onLayoutChildren(SkView* parent)
}
crossLimit += (parent->*crossGetSizeP)();
if (fAlign != kStretch_Align)
- crossSetSizeP = NULL;
+ crossSetSizeP = nullptr;
int childCount, flexCount;
SkScalar childLimit = compute_children_limit(parent, mainGetSizeP, &childCount, flexMask, &flexCount);
@@ -164,7 +164,7 @@ void SkStackViewLayout::onLayoutChildren(SkView* parent)
if (flexCount > 0 && parentLimit > childLimit)
flexAmount = (parentLimit - childLimit) / flexCount;
- while ((child = iter.next()) != NULL)
+ while ((child = iter.next()) != nullptr)
{
if (fRound)
pos = SkScalarRoundToScalar(pos);
@@ -258,7 +258,7 @@ void SkFillViewLayout::onLayoutChildren(SkView* parent)
SkView::B2FIter iter(parent);
SkView* child;
- while ((child = iter.next()) != NULL)
+ while ((child = iter.next()) != nullptr)
{
child->setLoc(fMargin.fLeft, fMargin.fTop);
child->setSize( parent->width() - fMargin.fRight - fMargin.fLeft,
« no previous file with comments | « src/views/SkProgressView.cpp ('k') | src/views/SkTagList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698