| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "platform/graphics/CompositorMutableState.h" | 5 #include "platform/graphics/CompositorMutableState.h" |
| 6 | 6 |
| 7 #include "cc/layers/layer_impl.h" | 7 #include "cc/layers/layer_impl.h" |
| 8 #include "cc/trees/layer_tree_impl.h" | 8 #include "cc/trees/layer_tree_impl.h" |
| 9 #include "platform/graphics/CompositorMutation.h" | 9 #include "platform/graphics/CompositorMutation.h" |
| 10 | 10 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 if (!m_mainLayer) | 38 if (!m_mainLayer) |
| 39 return; | 39 return; |
| 40 m_mainLayer->layer_tree_impl() | 40 m_mainLayer->layer_tree_impl() |
| 41 ->property_trees() | 41 ->property_trees() |
| 42 ->transform_tree.OnTransformAnimated(gfx::Transform(matrix), | 42 ->transform_tree.OnTransformAnimated(gfx::Transform(matrix), |
| 43 m_mainLayer->transform_tree_index(), | 43 m_mainLayer->transform_tree_index(), |
| 44 m_mainLayer->layer_tree_impl()); | 44 m_mainLayer->layer_tree_impl()); |
| 45 m_mutation->setTransform(matrix); | 45 m_mutation->setTransform(matrix); |
| 46 } | 46 } |
| 47 | 47 |
| 48 double CompositorMutableState::scrollLeft() const { | 48 float CompositorMutableState::scrollLeft() const { |
| 49 return m_scrollLayer ? m_scrollLayer->CurrentScrollOffset().x() : 0.0; | 49 return m_scrollLayer ? m_scrollLayer->CurrentScrollOffset().x() : 0.0; |
| 50 } | 50 } |
| 51 | 51 |
| 52 void CompositorMutableState::setScrollLeft(double scrollLeft) { | 52 void CompositorMutableState::setScrollLeft(float scrollLeft) { |
| 53 if (!m_scrollLayer) | 53 if (!m_scrollLayer) |
| 54 return; | 54 return; |
| 55 | 55 |
| 56 gfx::ScrollOffset offset = m_scrollLayer->CurrentScrollOffset(); | 56 gfx::ScrollOffset offset = m_scrollLayer->CurrentScrollOffset(); |
| 57 offset.set_x(scrollLeft); | 57 offset.set_x(scrollLeft); |
| 58 m_scrollLayer->layer_tree_impl() | 58 m_scrollLayer->layer_tree_impl() |
| 59 ->property_trees() | 59 ->property_trees() |
| 60 ->scroll_tree.OnScrollOffsetAnimated( | 60 ->scroll_tree.OnScrollOffsetAnimated( |
| 61 m_scrollLayer->id(), m_scrollLayer->transform_tree_index(), | 61 m_scrollLayer->id(), m_scrollLayer->transform_tree_index(), |
| 62 m_scrollLayer->scroll_tree_index(), offset, | 62 m_scrollLayer->scroll_tree_index(), offset, |
| 63 m_scrollLayer->layer_tree_impl()); | 63 m_scrollLayer->layer_tree_impl()); |
| 64 m_mutation->setScrollLeft(scrollLeft); | 64 m_mutation->setScrollLeft(scrollLeft); |
| 65 } | 65 } |
| 66 | 66 |
| 67 double CompositorMutableState::scrollTop() const { | 67 float CompositorMutableState::scrollTop() const { |
| 68 return m_scrollLayer ? m_scrollLayer->CurrentScrollOffset().y() : 0.0; | 68 return m_scrollLayer ? m_scrollLayer->CurrentScrollOffset().y() : 0.0; |
| 69 } | 69 } |
| 70 | 70 |
| 71 void CompositorMutableState::setScrollTop(double scrollTop) { | 71 void CompositorMutableState::setScrollTop(float scrollTop) { |
| 72 if (!m_scrollLayer) | 72 if (!m_scrollLayer) |
| 73 return; | 73 return; |
| 74 gfx::ScrollOffset offset = m_scrollLayer->CurrentScrollOffset(); | 74 gfx::ScrollOffset offset = m_scrollLayer->CurrentScrollOffset(); |
| 75 offset.set_y(scrollTop); | 75 offset.set_y(scrollTop); |
| 76 m_scrollLayer->layer_tree_impl() | 76 m_scrollLayer->layer_tree_impl() |
| 77 ->property_trees() | 77 ->property_trees() |
| 78 ->scroll_tree.OnScrollOffsetAnimated( | 78 ->scroll_tree.OnScrollOffsetAnimated( |
| 79 m_scrollLayer->id(), m_scrollLayer->transform_tree_index(), | 79 m_scrollLayer->id(), m_scrollLayer->transform_tree_index(), |
| 80 m_scrollLayer->scroll_tree_index(), offset, | 80 m_scrollLayer->scroll_tree_index(), offset, |
| 81 m_scrollLayer->layer_tree_impl()); | 81 m_scrollLayer->layer_tree_impl()); |
| 82 m_mutation->setScrollTop(scrollTop); | 82 m_mutation->setScrollTop(scrollTop); |
| 83 } | 83 } |
| 84 | 84 |
| 85 } // namespace blink | 85 } // namespace blink |
| OLD | NEW |