| 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_SCROLLBAR_LAYER_IMPL_BASE_H_ | 5 #ifndef CC_LAYERS_SCROLLBAR_LAYER_IMPL_BASE_H_ |
| 6 #define CC_LAYERS_SCROLLBAR_LAYER_IMPL_BASE_H_ | 6 #define CC_LAYERS_SCROLLBAR_LAYER_IMPL_BASE_H_ |
| 7 | 7 |
| 8 #include "base/containers/flat_set.h" |
| 8 #include "base/macros.h" | 9 #include "base/macros.h" |
| 9 #include "cc/cc_export.h" | 10 #include "cc/cc_export.h" |
| 10 #include "cc/input/scrollbar.h" | 11 #include "cc/input/scrollbar.h" |
| 11 #include "cc/layers/layer.h" | 12 #include "cc/layers/layer.h" |
| 12 #include "cc/layers/layer_impl.h" | 13 #include "cc/layers/layer_impl.h" |
| 13 | 14 |
| 14 namespace cc { | 15 namespace cc { |
| 15 | 16 |
| 16 class LayerTreeImpl; | 17 class LayerTreeImpl; |
| 17 | 18 |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 ScrollbarOrientation orientation_; | 90 ScrollbarOrientation orientation_; |
| 90 bool is_left_side_vertical_scrollbar_; | 91 bool is_left_side_vertical_scrollbar_; |
| 91 | 92 |
| 92 // Difference between the clip layer's height and the visible viewport | 93 // Difference between the clip layer's height and the visible viewport |
| 93 // height (which may differ in the presence of top-controls hiding). | 94 // height (which may differ in the presence of top-controls hiding). |
| 94 float vertical_adjust_; | 95 float vertical_adjust_; |
| 95 | 96 |
| 96 DISALLOW_COPY_AND_ASSIGN(ScrollbarLayerImplBase); | 97 DISALLOW_COPY_AND_ASSIGN(ScrollbarLayerImplBase); |
| 97 }; | 98 }; |
| 98 | 99 |
| 99 typedef std::set<ScrollbarLayerImplBase*> ScrollbarSet; | 100 using ScrollbarSet = base::flat_set<ScrollbarLayerImplBase*>; |
| 100 | 101 |
| 101 } // namespace cc | 102 } // namespace cc |
| 102 | 103 |
| 103 #endif // CC_LAYERS_SCROLLBAR_LAYER_IMPL_BASE_H_ | 104 #endif // CC_LAYERS_SCROLLBAR_LAYER_IMPL_BASE_H_ |
| OLD | NEW |