OLD | NEW |
---|---|
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 Loading... | |
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 bool alloc = bitmap_backing_.allocN32Pixels( | 67 bitmap_backing_.allocN32Pixels( |
68 canvas_size_.width(), canvas_size_.height(), layer_is_opaque_); | 68 canvas_size_.width(), canvas_size_.height(), layer_is_opaque_); |
69 // TODO(danak): Remove when skia does the check for us: crbug.com/360384 | 69 // TODO(danak): Remove when skia does the check for us: crbug.com/360384 |
danakj
2014/09/04 14:28:47
remove this TODO also
| |
70 CHECK(alloc); | |
71 canvas_ = skia::AdoptRef(new SkCanvas(bitmap_backing_)); | 70 canvas_ = skia::AdoptRef(new SkCanvas(bitmap_backing_)); |
72 DCHECK_EQ(content_rect.width(), canvas_->getBaseLayerSize().width()); | 71 DCHECK_EQ(content_rect.width(), canvas_->getBaseLayerSize().width()); |
73 DCHECK_EQ(content_rect.height(), canvas_->getBaseLayerSize().height()); | 72 DCHECK_EQ(content_rect.height(), canvas_->getBaseLayerSize().height()); |
74 } | 73 } |
75 | 74 |
76 base::TimeTicks start_time = | 75 base::TimeTicks start_time = |
77 rendering_stats_instrumentation_->StartRecording(); | 76 rendering_stats_instrumentation_->StartRecording(); |
78 PaintContents(canvas_.get(), | 77 PaintContents(canvas_.get(), |
79 content_rect, | 78 content_rect, |
80 contents_width_scale, | 79 contents_width_scale, |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
112 void BitmapContentLayerUpdater::SetOpaque(bool opaque) { | 111 void BitmapContentLayerUpdater::SetOpaque(bool opaque) { |
113 if (opaque != layer_is_opaque_) { | 112 if (opaque != layer_is_opaque_) { |
114 canvas_.clear(); | 113 canvas_.clear(); |
115 canvas_size_ = gfx::Size(); | 114 canvas_size_ = gfx::Size(); |
116 } | 115 } |
117 | 116 |
118 ContentLayerUpdater::SetOpaque(opaque); | 117 ContentLayerUpdater::SetOpaque(opaque); |
119 } | 118 } |
120 | 119 |
121 } // namespace cc | 120 } // namespace cc |
OLD | NEW |