| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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/layer_impl.h" | 5 #include "cc/layers/layer_impl.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 812 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 823 } | 823 } |
| 824 | 824 |
| 825 void LayerImpl::AddDamageRect(const gfx::Rect& damage_rect) { | 825 void LayerImpl::AddDamageRect(const gfx::Rect& damage_rect) { |
| 826 damage_rect_.Union(damage_rect); | 826 damage_rect_.Union(damage_rect); |
| 827 } | 827 } |
| 828 | 828 |
| 829 void LayerImpl::SetCurrentScrollOffset(const gfx::ScrollOffset& scroll_offset) { | 829 void LayerImpl::SetCurrentScrollOffset(const gfx::ScrollOffset& scroll_offset) { |
| 830 DCHECK(IsActive()); | 830 DCHECK(IsActive()); |
| 831 if (layer_tree_impl()->property_trees()->scroll_tree.SetScrollOffset( | 831 if (layer_tree_impl()->property_trees()->scroll_tree.SetScrollOffset( |
| 832 id(), scroll_offset)) | 832 id(), scroll_offset)) |
| 833 layer_tree_impl()->DidUpdateScrollOffset(id(), transform_tree_index()); | 833 layer_tree_impl()->DidUpdateScrollOffset(id()); |
| 834 } | 834 } |
| 835 | 835 |
| 836 gfx::ScrollOffset LayerImpl::CurrentScrollOffset() const { | 836 gfx::ScrollOffset LayerImpl::CurrentScrollOffset() const { |
| 837 return layer_tree_impl()->property_trees()->scroll_tree.current_scroll_offset( | 837 return layer_tree_impl()->property_trees()->scroll_tree.current_scroll_offset( |
| 838 id()); | 838 id()); |
| 839 } | 839 } |
| 840 | 840 |
| 841 void LayerImpl::UpdatePropertyTreeScrollOffset() { | 841 void LayerImpl::UpdatePropertyTreeScrollOffset() { |
| 842 // TODO(enne): in the future, scrolling should update the scroll tree | 842 // TODO(enne): in the future, scrolling should update the scroll tree |
| 843 // directly instead of going through layers. | 843 // directly instead of going through layers. |
| (...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1107 .layer_transforms_should_scale_layer_contents) { | 1107 .layer_transforms_should_scale_layer_contents) { |
| 1108 return default_scale; | 1108 return default_scale; |
| 1109 } | 1109 } |
| 1110 | 1110 |
| 1111 gfx::Vector2dF transform_scales = MathUtil::ComputeTransform2dScaleComponents( | 1111 gfx::Vector2dF transform_scales = MathUtil::ComputeTransform2dScaleComponents( |
| 1112 ScreenSpaceTransform(), default_scale); | 1112 ScreenSpaceTransform(), default_scale); |
| 1113 return std::max(transform_scales.x(), transform_scales.y()); | 1113 return std::max(transform_scales.x(), transform_scales.y()); |
| 1114 } | 1114 } |
| 1115 | 1115 |
| 1116 } // namespace cc | 1116 } // namespace cc |
| OLD | NEW |