Chromium Code Reviews| 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 #ifndef CC_LAYERS_LAYER_H_ | 5 #ifndef CC_LAYERS_LAYER_H_ |
| 6 #define CC_LAYERS_LAYER_H_ | 6 #define CC_LAYERS_LAYER_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 367 void ClearRenderSurface(); | 367 void ClearRenderSurface(); |
| 368 | 368 |
| 369 // The contents scale converts from logical, non-page-scaled pixels to target | 369 // The contents scale converts from logical, non-page-scaled pixels to target |
| 370 // pixels. The contents scale is 1 for the root layer as it is already in | 370 // pixels. The contents scale is 1 for the root layer as it is already in |
| 371 // physical pixels. By default contents scale is forced to be 1 except for | 371 // physical pixels. By default contents scale is forced to be 1 except for |
| 372 // subclasses of ContentsScalingLayer. | 372 // subclasses of ContentsScalingLayer. |
| 373 float contents_scale_x() const { return draw_properties_.contents_scale_x; } | 373 float contents_scale_x() const { return draw_properties_.contents_scale_x; } |
| 374 float contents_scale_y() const { return draw_properties_.contents_scale_y; } | 374 float contents_scale_y() const { return draw_properties_.contents_scale_y; } |
| 375 gfx::Size content_bounds() const { return draw_properties_.content_bounds; } | 375 gfx::Size content_bounds() const { return draw_properties_.content_bounds; } |
| 376 | 376 |
| 377 bool GetAnimationBounds(gfx::BoxF* out) const { return false; } | |
|
Ian Vollick
2013/11/28 00:05:12
I don't think this will be necessary. Ultimately,
avallee
2013/11/28 00:31:08
It's not. I forgot to delete this in the CL here.
| |
| 378 | |
| 377 virtual void CalculateContentsScale(float ideal_contents_scale, | 379 virtual void CalculateContentsScale(float ideal_contents_scale, |
| 378 float device_scale_factor, | 380 float device_scale_factor, |
| 379 float page_scale_factor, | 381 float page_scale_factor, |
| 380 bool animating_transform_to_screen, | 382 bool animating_transform_to_screen, |
| 381 float* contents_scale_x, | 383 float* contents_scale_x, |
| 382 float* contents_scale_y, | 384 float* contents_scale_y, |
| 383 gfx::Size* content_bounds); | 385 gfx::Size* content_bounds); |
| 384 | 386 |
| 385 LayerTreeHost* layer_tree_host() { return layer_tree_host_; } | 387 LayerTreeHost* layer_tree_host() { return layer_tree_host_; } |
| 386 const LayerTreeHost* layer_tree_host() const { return layer_tree_host_; } | 388 const LayerTreeHost* layer_tree_host() const { return layer_tree_host_; } |
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 612 DrawProperties<Layer> draw_properties_; | 614 DrawProperties<Layer> draw_properties_; |
| 613 | 615 |
| 614 PaintProperties paint_properties_; | 616 PaintProperties paint_properties_; |
| 615 | 617 |
| 616 DISALLOW_COPY_AND_ASSIGN(Layer); | 618 DISALLOW_COPY_AND_ASSIGN(Layer); |
| 617 }; | 619 }; |
| 618 | 620 |
| 619 } // namespace cc | 621 } // namespace cc |
| 620 | 622 |
| 621 #endif // CC_LAYERS_LAYER_H_ | 623 #endif // CC_LAYERS_LAYER_H_ |
| OLD | NEW |