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

Side by Side Diff: cc/resources/skpicture_content_layer_updater.cc

Issue 222573002: cc: Add CHECKs that the backing size reported by canvas matches. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: contentupdatercrash: Created 6 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « cc/resources/content_layer_updater.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 SkPictureContentLayerUpdater::~SkPictureContentLayerUpdater() {} 22 SkPictureContentLayerUpdater::~SkPictureContentLayerUpdater() {}
23 23
24 void SkPictureContentLayerUpdater::PrepareToUpdate( 24 void SkPictureContentLayerUpdater::PrepareToUpdate(
25 const gfx::Rect& content_rect, 25 const gfx::Rect& content_rect,
26 const gfx::Size&, 26 const gfx::Size&,
27 float contents_width_scale, 27 float contents_width_scale,
28 float contents_height_scale, 28 float contents_height_scale,
29 gfx::Rect* resulting_opaque_rect) { 29 gfx::Rect* resulting_opaque_rect) {
30 SkCanvas* canvas = 30 SkCanvas* canvas =
31 picture_.beginRecording(content_rect.width(), content_rect.height()); 31 picture_.beginRecording(content_rect.width(), content_rect.height());
32 SkISize size = canvas->getBaseLayerSize();
33 CHECK_EQ(content_rect.width(), size.width());
34 CHECK_EQ(content_rect.height(), size.height());
32 base::TimeTicks start_time = 35 base::TimeTicks start_time =
33 rendering_stats_instrumentation_->StartRecording(); 36 rendering_stats_instrumentation_->StartRecording();
34 PaintContents(canvas, 37 PaintContents(canvas,
35 content_rect.origin(), 38 content_rect,
36 contents_width_scale, 39 contents_width_scale,
37 contents_height_scale, 40 contents_height_scale,
38 resulting_opaque_rect); 41 resulting_opaque_rect);
39 base::TimeDelta duration = 42 base::TimeDelta duration =
40 rendering_stats_instrumentation_->EndRecording(start_time); 43 rendering_stats_instrumentation_->EndRecording(start_time);
41 rendering_stats_instrumentation_->AddRecord( 44 rendering_stats_instrumentation_->AddRecord(
42 duration, content_rect.width() * content_rect.height()); 45 duration, content_rect.width() * content_rect.height());
43 picture_.endRecording(); 46 picture_.endRecording();
44 } 47 }
45 48
46 void SkPictureContentLayerUpdater::DrawPicture(SkCanvas* canvas) { 49 void SkPictureContentLayerUpdater::DrawPicture(SkCanvas* canvas) {
47 TRACE_EVENT0("cc", "SkPictureContentLayerUpdater::DrawPicture"); 50 TRACE_EVENT0("cc", "SkPictureContentLayerUpdater::DrawPicture");
48 canvas->drawPicture(picture_); 51 canvas->drawPicture(picture_);
49 } 52 }
50 53
51 } // namespace cc 54 } // namespace cc
OLDNEW
« no previous file with comments | « cc/resources/content_layer_updater.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698