Chromium Code Reviews| 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 #ifndef CC_TREES_LAYER_TREE_HOST_H_ | 5 #ifndef CC_TREES_LAYER_TREE_HOST_H_ |
| 6 #define CC_TREES_LAYER_TREE_HOST_H_ | 6 #define CC_TREES_LAYER_TREE_HOST_H_ |
| 7 | 7 |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 231 std::numeric_limits<size_t>::max(); | 231 std::numeric_limits<size_t>::max(); |
| 232 } | 232 } |
| 233 bool RequestPartialTextureUpdate(); | 233 bool RequestPartialTextureUpdate(); |
| 234 | 234 |
| 235 void SetDeviceScaleFactor(float device_scale_factor); | 235 void SetDeviceScaleFactor(float device_scale_factor); |
| 236 float device_scale_factor() const { return device_scale_factor_; } | 236 float device_scale_factor() const { return device_scale_factor_; } |
| 237 | 237 |
| 238 void UpdateTopControlsState(TopControlsState constraints, | 238 void UpdateTopControlsState(TopControlsState constraints, |
| 239 TopControlsState current, | 239 TopControlsState current, |
| 240 bool animate); | 240 bool animate); |
| 241 void UpdateTopControlsStatePreservingConstraints( | |
| 242 TopControlsState current, | |
| 243 bool animate); | |
| 241 | 244 |
| 242 HeadsUpDisplayLayer* hud_layer() const { return hud_layer_.get(); } | 245 HeadsUpDisplayLayer* hud_layer() const { return hud_layer_.get(); } |
| 243 | 246 |
| 244 Proxy* proxy() const { return proxy_.get(); } | 247 Proxy* proxy() const { return proxy_.get(); } |
| 245 | 248 |
| 246 AnimationRegistrar* animation_registrar() const { | 249 AnimationRegistrar* animation_registrar() const { |
| 247 return animation_registrar_.get(); | 250 return animation_registrar_.get(); |
| 248 } | 251 } |
| 249 | 252 |
| 250 skia::RefPtr<SkPicture> CapturePicture(); | 253 skia::RefPtr<SkPicture> CapturePicture(); |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 359 : total_num_cc_layers(0), | 362 : total_num_cc_layers(0), |
| 360 total_num_cc_layers_can_use_lcd_text(0), | 363 total_num_cc_layers_can_use_lcd_text(0), |
| 361 total_num_cc_layers_will_use_lcd_text(0) {} | 364 total_num_cc_layers_will_use_lcd_text(0) {} |
| 362 | 365 |
| 363 int64 total_num_cc_layers; | 366 int64 total_num_cc_layers; |
| 364 int64 total_num_cc_layers_can_use_lcd_text; | 367 int64 total_num_cc_layers_can_use_lcd_text; |
| 365 int64 total_num_cc_layers_will_use_lcd_text; | 368 int64 total_num_cc_layers_will_use_lcd_text; |
| 366 }; | 369 }; |
| 367 LCDTextMetrics lcd_text_metrics_; | 370 LCDTextMetrics lcd_text_metrics_; |
| 368 | 371 |
| 372 TopControlsState top_controls_constraints_; | |
|
jamesr
2013/06/10 23:48:31
where is this initialized?
Jinsuk Kim
2013/06/11 04:53:18
Good catch. Put the initialization in RenderViewIm
| |
| 373 | |
| 369 DISALLOW_COPY_AND_ASSIGN(LayerTreeHost); | 374 DISALLOW_COPY_AND_ASSIGN(LayerTreeHost); |
| 370 }; | 375 }; |
| 371 | 376 |
| 372 } // namespace cc | 377 } // namespace cc |
| 373 | 378 |
| 374 #endif // CC_TREES_LAYER_TREE_HOST_H_ | 379 #endif // CC_TREES_LAYER_TREE_HOST_H_ |
| OLD | NEW |