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

Unified Diff: Source/core/html/canvas/CanvasStyle.cpp

Issue 170603003: Use nullptr_t for RefPtr, PassRefPtr and RawPtr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final rebase Created 6 years, 10 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/html/canvas/CanvasRenderingContext2D.cpp ('k') | Source/core/html/canvas/DataView.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/canvas/CanvasStyle.cpp
diff --git a/Source/core/html/canvas/CanvasStyle.cpp b/Source/core/html/canvas/CanvasStyle.cpp
index d7229866347b074b2821dd5af7fbe248cd5c9d33..8d7f26eb095a78ab11ff18770456ec50c6a64b9c 100644
--- a/Source/core/html/canvas/CanvasStyle.cpp
+++ b/Source/core/html/canvas/CanvasStyle.cpp
@@ -134,10 +134,10 @@ PassRefPtr<CanvasStyle> CanvasStyle::createFromString(const String& color, Docum
case ParsedCurrentColor:
return adoptRef(new CanvasStyle(CurrentColor));
case ParseFailed:
- return 0;
+ return nullptr;
default:
ASSERT_NOT_REACHED();
- return 0;
+ return nullptr;
}
}
@@ -151,23 +151,24 @@ PassRefPtr<CanvasStyle> CanvasStyle::createFromStringWithOverrideAlpha(const Str
case ParsedCurrentColor:
return adoptRef(new CanvasStyle(CurrentColorWithOverrideAlpha, alpha));
case ParseFailed:
- return 0;
+ return nullptr;
default:
ASSERT_NOT_REACHED();
- return 0;
+ return nullptr;
}
}
PassRefPtr<CanvasStyle> CanvasStyle::createFromGradient(PassRefPtr<CanvasGradient> gradient)
{
if (!gradient)
- return 0;
+ return nullptr;
return adoptRef(new CanvasStyle(gradient));
}
+
PassRefPtr<CanvasStyle> CanvasStyle::createFromPattern(PassRefPtr<CanvasPattern> pattern)
{
if (!pattern)
- return 0;
+ return nullptr;
return adoptRef(new CanvasStyle(pattern));
}
« no previous file with comments | « Source/core/html/canvas/CanvasRenderingContext2D.cpp ('k') | Source/core/html/canvas/DataView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698