| 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 #include "cc/layers/scrollbar_layer_impl_base.h" | 5 #include "cc/layers/scrollbar_layer_impl_base.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include "cc/trees/effect_node.h" | 8 #include "cc/trees/effect_node.h" |
| 9 #include "cc/trees/layer_tree_impl.h" | 9 #include "cc/trees/layer_tree_impl.h" |
| 10 #include "ui/gfx/geometry/rect_conversions.h" | 10 #include "ui/gfx/geometry/rect_conversions.h" |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 return true; | 59 return true; |
| 60 } | 60 } |
| 61 | 61 |
| 62 bool ScrollbarLayerImplBase::CanScrollOrientation() const { | 62 bool ScrollbarLayerImplBase::CanScrollOrientation() const { |
| 63 // TODO(pdr): Refactor this to not depend on layers by using the associated | 63 // TODO(pdr): Refactor this to not depend on layers by using the associated |
| 64 // scroll node's user_scrollable values. | 64 // scroll node's user_scrollable values. |
| 65 LayerImpl* scroll_layer = | 65 LayerImpl* scroll_layer = |
| 66 layer_tree_impl()->LayerByElementId(scroll_element_id_); | 66 layer_tree_impl()->LayerByElementId(scroll_element_id_); |
| 67 if (!scroll_layer) | 67 if (!scroll_layer) |
| 68 return false; | 68 return false; |
| 69 |
| 69 return scroll_layer->user_scrollable(orientation()) && | 70 return scroll_layer->user_scrollable(orientation()) && |
| 71 // Ensure clip_layer_length_ smaller than scroll_layer_length_ not |
| 72 // caused by floating error. |
| 73 !MathUtil::IsFloatNearlyTheSame(clip_layer_length_, |
| 74 scroll_layer_length_) && |
| 70 clip_layer_length_ < scroll_layer_length_; | 75 clip_layer_length_ < scroll_layer_length_; |
| 71 } | 76 } |
| 72 | 77 |
| 73 bool ScrollbarLayerImplBase::SetVerticalAdjust(float vertical_adjust) { | 78 bool ScrollbarLayerImplBase::SetVerticalAdjust(float vertical_adjust) { |
| 74 if (vertical_adjust_ == vertical_adjust) | 79 if (vertical_adjust_ == vertical_adjust) |
| 75 return false; | 80 return false; |
| 76 vertical_adjust_ = vertical_adjust; | 81 vertical_adjust_ = vertical_adjust; |
| 77 NoteLayerPropertyChanged(); | 82 NoteLayerPropertyChanged(); |
| 78 return true; | 83 return true; |
| 79 } | 84 } |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 layer_tree_impl()->AddToOpacityAnimationsMap(id(), opacity); | 231 layer_tree_impl()->AddToOpacityAnimationsMap(id(), opacity); |
| 227 | 232 |
| 228 node->opacity = opacity; | 233 node->opacity = opacity; |
| 229 node->effect_changed = true; | 234 node->effect_changed = true; |
| 230 property_trees->changed = true; | 235 property_trees->changed = true; |
| 231 property_trees->effect_tree.set_needs_update(true); | 236 property_trees->effect_tree.set_needs_update(true); |
| 232 layer_tree_impl()->set_needs_update_draw_properties(); | 237 layer_tree_impl()->set_needs_update_draw_properties(); |
| 233 } | 238 } |
| 234 | 239 |
| 235 } // namespace cc | 240 } // namespace cc |
| OLD | NEW |