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

Unified Diff: src/views/animated/SkWidgetViews.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/animated/SkStaticTextView.cpp ('k') | src/views/sdl/SkOSWindow_SDL.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/views/animated/SkWidgetViews.cpp
diff --git a/src/views/animated/SkWidgetViews.cpp b/src/views/animated/SkWidgetViews.cpp
index cd22678d922c467ada3468253389dd4410257919..9d3c936523ef4d4b63575a1dd1ac440bf7e4613f 100644
--- a/src/views/animated/SkWidgetViews.cpp
+++ b/src/views/animated/SkWidgetViews.cpp
@@ -110,7 +110,7 @@ void SkWidgetView::setLabel(const char label[])
void SkWidgetView::setLabel(const char label[], size_t len)
{
- if ((label == NULL && fLabel.size() != 0) || !fLabel.equals(label, len))
+ if ((label == nullptr && fLabel.size() != 0) || !fLabel.equals(label, len))
{
SkString tmp(label, len);
@@ -153,13 +153,13 @@ bool SkWidgetView::postWidgetEvent()
if (label)
this->setLabel(label);
- if ((node = dom.getFirstChild(node, "event")) != NULL)
+ if ((node = dom.getFirstChild(node, "event")) != nullptr)
fEvent.inflate(dom, node);
}
/*virtual*/ void SkWidgetView::onLabelChange(const char oldLabel[], const char newLabel[])
{
- this->inval(NULL);
+ this->inval(nullptr);
}
static const char gWidgetEventSinkIDSlotName[] = "sk-widget-sinkid-slot";
@@ -208,7 +208,7 @@ void SkCheckButtonView::setCheckState(CheckState state)
/*virtual*/ void SkCheckButtonView::onCheckStateChange(CheckState oldState, CheckState newState)
{
- this->inval(NULL);
+ this->inval(nullptr);
}
/*virtual*/ void SkCheckButtonView::onInflate(const SkDOM& dom, const SkDOM::Node* node)
@@ -296,7 +296,7 @@ protected:
SkAnimator::DifferenceType diff = fAnim.draw(canvas, &paint, SkTime::GetMSecs());
if (diff == SkAnimator::kDifferent)
- this->inval(NULL);
+ this->inval(nullptr);
else if (diff == SkAnimator::kPartiallyDifferent)
{
SkRect bounds;
@@ -309,7 +309,7 @@ protected:
{
if (evt.isType(SK_EventType_Inval))
{
- this->inval(NULL);
+ this->inval(nullptr);
return true;
}
if (evt.isType("recommendDim"))
@@ -346,8 +346,8 @@ private:
SkView* SkWidgetFactory(const char name[])
{
- if (name == NULL)
- return NULL;
+ if (name == nullptr)
+ return nullptr;
// must be in the same order as the SkSkinWidgetEnum is declared
static const char* gNames[] = {
@@ -365,7 +365,7 @@ SkView* SkWidgetFactory(const char name[])
if (!strcmp(gNames[i], name))
return SkWidgetFactory((SkWidgetEnum)i);
- return NULL;
+ return nullptr;
}
#include "SkImageView.h"
@@ -394,5 +394,5 @@ SkView* SkWidgetFactory(SkWidgetEnum sw)
SkDEBUGFAIL("unknown enum passed to SkWidgetFactory");
break;
}
- return NULL;
+ return nullptr;
}
« no previous file with comments | « src/views/animated/SkStaticTextView.cpp ('k') | src/views/sdl/SkOSWindow_SDL.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698