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

Unified Diff: cc/resources/picture_pile_impl.cc

Issue 638353002: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr in src/… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formating. Created 6 years, 2 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
Index: cc/resources/picture_pile_impl.cc
diff --git a/cc/resources/picture_pile_impl.cc b/cc/resources/picture_pile_impl.cc
index f4fbdf2d014eaee8a2ad44125d267b4b077be4dd..d89bc278097d7f62a92525aac17e0e2df7cb5e50 100644
--- a/cc/resources/picture_pile_impl.cc
+++ b/cc/resources/picture_pile_impl.cc
@@ -44,7 +44,7 @@ void PicturePileImpl::RasterDirect(
float contents_scale,
RenderingStatsInstrumentation* rendering_stats_instrumentation) {
RasterCommon(canvas,
- NULL,
+ nullptr,
canvas_rect,
contents_scale,
rendering_stats_instrumentation,
@@ -123,7 +123,7 @@ void PicturePileImpl::RasterToBitmap(
}
RasterCommon(canvas,
- NULL,
+ nullptr,
canvas_rect,
contents_scale,
rendering_stats_instrumentation,
@@ -317,7 +317,7 @@ skia::RefPtr<SkPicture> PicturePileImpl::GetFlattenedPicture() {
SkCanvas* canvas =
recorder.beginRecording(tiling_rect.width(), tiling_rect.height());
if (!tiling_rect.IsEmpty())
- RasterToBitmap(canvas, tiling_rect, 1.0, NULL);
+ RasterToBitmap(canvas, tiling_rect, 1.0, nullptr);
skia::RefPtr<SkPicture> picture = skia::AdoptRef(recorder.endRecording());
return picture;
@@ -326,7 +326,7 @@ skia::RefPtr<SkPicture> PicturePileImpl::GetFlattenedPicture() {
void PicturePileImpl::AnalyzeInRect(const gfx::Rect& content_rect,
float contents_scale,
PicturePileImpl::Analysis* analysis) const {
- AnalyzeInRect(content_rect, contents_scale, analysis, NULL);
+ AnalyzeInRect(content_rect, contents_scale, analysis, nullptr);
}
void PicturePileImpl::AnalyzeInRect(

Powered by Google App Engine
This is Rietveld 408576698