OLD | NEW |
1 // Copyright 2010 The Chromium Authors. All rights reserved. | 1 // Copyright 2010 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/layers/content_layer.h" | 5 #include "cc/layers/content_layer.h" |
6 | 6 |
7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "base/metrics/histogram.h" | 8 #include "base/metrics/histogram.h" |
9 #include "base/time/time.h" | 9 #include "base/time/time.h" |
10 #include "cc/layers/content_layer_client.h" | 10 #include "cc/layers/content_layer_client.h" |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
92 return NeedsIdlePaint(); | 92 return NeedsIdlePaint(); |
93 } | 93 } |
94 | 94 |
95 LayerUpdater* ContentLayer::Updater() const { | 95 LayerUpdater* ContentLayer::Updater() const { |
96 return updater_.get(); | 96 return updater_.get(); |
97 } | 97 } |
98 | 98 |
99 void ContentLayer::CreateUpdaterIfNeeded() { | 99 void ContentLayer::CreateUpdaterIfNeeded() { |
100 if (updater_.get()) | 100 if (updater_.get()) |
101 return; | 101 return; |
102 scoped_ptr<LayerPainter> painter = ContentLayerPainter::Create(client_); | 102 scoped_ptr<LayerPainter> painter = |
| 103 ContentLayerPainter::Create(client_).PassAs<LayerPainter>(); |
103 if (layer_tree_host()->settings().per_tile_painting_enabled) { | 104 if (layer_tree_host()->settings().per_tile_painting_enabled) { |
104 updater_ = BitmapSkPictureContentLayerUpdater::Create( | 105 updater_ = BitmapSkPictureContentLayerUpdater::Create( |
105 painter.Pass(), | 106 painter.Pass(), |
106 rendering_stats_instrumentation(), | 107 rendering_stats_instrumentation(), |
107 id()); | 108 id()); |
108 } else { | 109 } else { |
109 updater_ = BitmapContentLayerUpdater::Create( | 110 updater_ = BitmapContentLayerUpdater::Create( |
110 painter.Pass(), | 111 painter.Pass(), |
111 rendering_stats_instrumentation(), | 112 rendering_stats_instrumentation(), |
112 id()); | 113 id()); |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
155 return picture; | 156 return picture; |
156 } | 157 } |
157 | 158 |
158 void ContentLayer::OnOutputSurfaceCreated() { | 159 void ContentLayer::OnOutputSurfaceCreated() { |
159 SetTextureFormat( | 160 SetTextureFormat( |
160 layer_tree_host()->GetRendererCapabilities().best_texture_format); | 161 layer_tree_host()->GetRendererCapabilities().best_texture_format); |
161 TiledLayer::OnOutputSurfaceCreated(); | 162 TiledLayer::OnOutputSurfaceCreated(); |
162 } | 163 } |
163 | 164 |
164 } // namespace cc | 165 } // namespace cc |
OLD | NEW |