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

Side by Side Diff: cc/resources/skpicture_content_layer_updater.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 unified diff | Download patch
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/resources/skpicture_content_layer_updater.h" 5 #include "cc/resources/skpicture_content_layer_updater.h"
6 6
7 #include "base/debug/trace_event.h" 7 #include "base/debug/trace_event.h"
8 #include "cc/debug/rendering_stats_instrumentation.h" 8 #include "cc/debug/rendering_stats_instrumentation.h"
9 #include "cc/resources/layer_painter.h" 9 #include "cc/resources/layer_painter.h"
10 #include "cc/resources/prioritized_resource.h" 10 #include "cc/resources/prioritized_resource.h"
(...skipping 11 matching lines...) Expand all
22 22
23 SkPictureContentLayerUpdater::~SkPictureContentLayerUpdater() {} 23 SkPictureContentLayerUpdater::~SkPictureContentLayerUpdater() {}
24 24
25 void SkPictureContentLayerUpdater::PrepareToUpdate( 25 void SkPictureContentLayerUpdater::PrepareToUpdate(
26 const gfx::Size& content_size, 26 const gfx::Size& content_size,
27 const gfx::Rect& paint_rect, 27 const gfx::Rect& paint_rect,
28 const gfx::Size& tile_size, 28 const gfx::Size& tile_size,
29 float contents_width_scale, 29 float contents_width_scale,
30 float contents_height_scale) { 30 float contents_height_scale) {
31 SkPictureRecorder recorder; 31 SkPictureRecorder recorder;
32 SkCanvas* canvas = 32 SkCanvas* canvas = recorder.beginRecording(
33 recorder.beginRecording(paint_rect.width(), paint_rect.height(), NULL, 0); 33 paint_rect.width(), paint_rect.height(), nullptr, 0);
34 DCHECK_EQ(paint_rect.width(), canvas->getBaseLayerSize().width()); 34 DCHECK_EQ(paint_rect.width(), canvas->getBaseLayerSize().width());
35 DCHECK_EQ(paint_rect.height(), canvas->getBaseLayerSize().height()); 35 DCHECK_EQ(paint_rect.height(), canvas->getBaseLayerSize().height());
36 base::TimeTicks start_time = 36 base::TimeTicks start_time =
37 rendering_stats_instrumentation_->StartRecording(); 37 rendering_stats_instrumentation_->StartRecording();
38 PaintContents(canvas, 38 PaintContents(canvas,
39 content_size, 39 content_size,
40 paint_rect, 40 paint_rect,
41 contents_width_scale, 41 contents_width_scale,
42 contents_height_scale); 42 contents_height_scale);
43 base::TimeDelta duration = 43 base::TimeDelta duration =
44 rendering_stats_instrumentation_->EndRecording(start_time); 44 rendering_stats_instrumentation_->EndRecording(start_time);
45 rendering_stats_instrumentation_->AddRecord( 45 rendering_stats_instrumentation_->AddRecord(
46 duration, paint_rect.width() * paint_rect.height()); 46 duration, paint_rect.width() * paint_rect.height());
47 picture_ = skia::AdoptRef(recorder.endRecording()); 47 picture_ = skia::AdoptRef(recorder.endRecording());
48 } 48 }
49 49
50 void SkPictureContentLayerUpdater::DrawPicture(SkCanvas* canvas) { 50 void SkPictureContentLayerUpdater::DrawPicture(SkCanvas* canvas) {
51 TRACE_EVENT0("cc", "SkPictureContentLayerUpdater::DrawPicture"); 51 TRACE_EVENT0("cc", "SkPictureContentLayerUpdater::DrawPicture");
52 if (picture_) 52 if (picture_)
53 canvas->drawPicture(picture_.get()); 53 canvas->drawPicture(picture_.get());
54 } 54 }
55 55
56 } // namespace cc 56 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698