OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_PAINTED_SCROLLBAR_LAYER_H_ | 5 #ifndef CC_LAYERS_PAINTED_SCROLLBAR_LAYER_H_ |
6 #define CC_LAYERS_PAINTED_SCROLLBAR_LAYER_H_ | 6 #define CC_LAYERS_PAINTED_SCROLLBAR_LAYER_H_ |
7 | 7 |
8 #include "cc/base/cc_export.h" | 8 #include "cc/base/cc_export.h" |
9 #include "cc/input/scrollbar.h" | 9 #include "cc/input/scrollbar.h" |
10 #include "cc/layers/contents_scaling_layer.h" | 10 #include "cc/layers/contents_scaling_layer.h" |
(...skipping 27 matching lines...) Expand all Loading... |
38 | 38 |
39 // Layer interface | 39 // Layer interface |
40 virtual bool Update(ResourceUpdateQueue* queue, | 40 virtual bool Update(ResourceUpdateQueue* queue, |
41 const OcclusionTracker<Layer>* occlusion) OVERRIDE; | 41 const OcclusionTracker<Layer>* occlusion) OVERRIDE; |
42 virtual void SetLayerTreeHost(LayerTreeHost* host) OVERRIDE; | 42 virtual void SetLayerTreeHost(LayerTreeHost* host) OVERRIDE; |
43 virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE; | 43 virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE; |
44 virtual void PushScrollClipPropertiesTo(LayerImpl* layer) OVERRIDE; | 44 virtual void PushScrollClipPropertiesTo(LayerImpl* layer) OVERRIDE; |
45 virtual void CalculateContentsScale(float ideal_contents_scale, | 45 virtual void CalculateContentsScale(float ideal_contents_scale, |
46 float device_scale_factor, | 46 float device_scale_factor, |
47 float page_scale_factor, | 47 float page_scale_factor, |
| 48 float maximum_animation_contents_scale, |
48 bool animating_transform_to_screen, | 49 bool animating_transform_to_screen, |
49 float* contents_scale_x, | 50 float* contents_scale_x, |
50 float* contents_scale_y, | 51 float* contents_scale_y, |
51 gfx::Size* content_bounds) OVERRIDE; | 52 gfx::Size* content_bounds) OVERRIDE; |
52 | 53 |
53 protected: | 54 protected: |
54 PaintedScrollbarLayer(scoped_ptr<Scrollbar> scrollbar, int scroll_layer_id); | 55 PaintedScrollbarLayer(scoped_ptr<Scrollbar> scrollbar, int scroll_layer_id); |
55 virtual ~PaintedScrollbarLayer(); | 56 virtual ~PaintedScrollbarLayer(); |
56 | 57 |
57 // For unit tests | 58 // For unit tests |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 | 97 |
97 scoped_ptr<ScopedUIResource> track_resource_; | 98 scoped_ptr<ScopedUIResource> track_resource_; |
98 scoped_ptr<ScopedUIResource> thumb_resource_; | 99 scoped_ptr<ScopedUIResource> thumb_resource_; |
99 | 100 |
100 DISALLOW_COPY_AND_ASSIGN(PaintedScrollbarLayer); | 101 DISALLOW_COPY_AND_ASSIGN(PaintedScrollbarLayer); |
101 }; | 102 }; |
102 | 103 |
103 } // namespace cc | 104 } // namespace cc |
104 | 105 |
105 #endif // CC_LAYERS_PAINTED_SCROLLBAR_LAYER_H_ | 106 #endif // CC_LAYERS_PAINTED_SCROLLBAR_LAYER_H_ |
OLD | NEW |