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

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

Issue 197883017: SkColorType instead of (deprecated) SkBitmap::Config (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments from #5 Created 6 years, 9 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/output/renderer_pixeltest.cc ('k') | cc/resources/picture_pile_impl_unittest.cc » ('j') | 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/bitmap_content_layer_updater.h" 5 #include "cc/resources/bitmap_content_layer_updater.h"
6 6
7 #include "cc/debug/devtools_instrumentation.h" 7 #include "cc/debug/devtools_instrumentation.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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 void BitmapContentLayerUpdater::PrepareToUpdate( 57 void BitmapContentLayerUpdater::PrepareToUpdate(
58 const gfx::Rect& content_rect, 58 const gfx::Rect& content_rect,
59 const gfx::Size& tile_size, 59 const gfx::Size& tile_size,
60 float contents_width_scale, 60 float contents_width_scale,
61 float contents_height_scale, 61 float contents_height_scale,
62 gfx::Rect* resulting_opaque_rect) { 62 gfx::Rect* resulting_opaque_rect) {
63 if (canvas_size_ != content_rect.size()) { 63 if (canvas_size_ != content_rect.size()) {
64 devtools_instrumentation::ScopedLayerTask paint_setup( 64 devtools_instrumentation::ScopedLayerTask paint_setup(
65 devtools_instrumentation::kPaintSetup, layer_id_); 65 devtools_instrumentation::kPaintSetup, layer_id_);
66 canvas_size_ = content_rect.size(); 66 canvas_size_ = content_rect.size();
67 bitmap_backing_.setConfig( 67 bitmap_backing_.allocN32Pixels(
68 SkBitmap::kARGB_8888_Config, 68 canvas_size_.width(), canvas_size_.height(), layer_is_opaque_);
69 canvas_size_.width(), canvas_size_.height(),
70 0, layer_is_opaque_ ? kOpaque_SkAlphaType : kPremul_SkAlphaType);
71 bitmap_backing_.allocPixels();
72 canvas_ = skia::AdoptRef(new SkCanvas(bitmap_backing_)); 69 canvas_ = skia::AdoptRef(new SkCanvas(bitmap_backing_));
73 } 70 }
74 71
75 base::TimeTicks start_time = 72 base::TimeTicks start_time =
76 rendering_stats_instrumentation_->StartRecording(); 73 rendering_stats_instrumentation_->StartRecording();
77 PaintContents(canvas_.get(), 74 PaintContents(canvas_.get(),
78 content_rect.origin(), 75 content_rect.origin(),
79 contents_width_scale, 76 contents_width_scale,
80 contents_height_scale, 77 contents_height_scale,
81 resulting_opaque_rect); 78 resulting_opaque_rect);
(...skipping 29 matching lines...) Expand all
111 void BitmapContentLayerUpdater::SetOpaque(bool opaque) { 108 void BitmapContentLayerUpdater::SetOpaque(bool opaque) {
112 if (opaque != layer_is_opaque_) { 109 if (opaque != layer_is_opaque_) {
113 canvas_.clear(); 110 canvas_.clear();
114 canvas_size_ = gfx::Size(); 111 canvas_size_ = gfx::Size();
115 } 112 }
116 113
117 ContentLayerUpdater::SetOpaque(opaque); 114 ContentLayerUpdater::SetOpaque(opaque);
118 } 115 }
119 116
120 } // namespace cc 117 } // namespace cc
OLDNEW
« no previous file with comments | « cc/output/renderer_pixeltest.cc ('k') | cc/resources/picture_pile_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698