OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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/trees/layer_tree_impl.h" | 5 #include "cc/trees/layer_tree_impl.h" |
6 | 6 |
7 #include <limits> | 7 #include <limits> |
8 #include <set> | 8 #include <set> |
9 | 9 |
10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 LayerTreeImpl* layer_tree) | 43 LayerTreeImpl* layer_tree) |
44 : layer_(layer), delegate_(delegate), layer_tree_impl_(layer_tree) {} | 44 : layer_(layer), delegate_(delegate), layer_tree_impl_(layer_tree) {} |
45 virtual ~LayerScrollOffsetDelegateProxy() {} | 45 virtual ~LayerScrollOffsetDelegateProxy() {} |
46 | 46 |
47 gfx::ScrollOffset last_set_scroll_offset() const { | 47 gfx::ScrollOffset last_set_scroll_offset() const { |
48 return last_set_scroll_offset_; | 48 return last_set_scroll_offset_; |
49 } | 49 } |
50 | 50 |
51 // LayerScrollOffsetDelegate implementation. | 51 // LayerScrollOffsetDelegate implementation. |
52 virtual void SetTotalScrollOffset( | 52 virtual void SetTotalScrollOffset( |
53 const gfx::ScrollOffset& new_offset) OVERRIDE { | 53 const gfx::ScrollOffset& new_offset) override { |
54 last_set_scroll_offset_ = new_offset; | 54 last_set_scroll_offset_ = new_offset; |
55 layer_tree_impl_->UpdateScrollOffsetDelegate(); | 55 layer_tree_impl_->UpdateScrollOffsetDelegate(); |
56 } | 56 } |
57 | 57 |
58 virtual gfx::ScrollOffset GetTotalScrollOffset() OVERRIDE { | 58 virtual gfx::ScrollOffset GetTotalScrollOffset() override { |
59 return layer_tree_impl_->GetDelegatedScrollOffset(layer_); | 59 return layer_tree_impl_->GetDelegatedScrollOffset(layer_); |
60 } | 60 } |
61 | 61 |
62 virtual bool IsExternalFlingActive() const OVERRIDE { | 62 virtual bool IsExternalFlingActive() const override { |
63 return delegate_->IsExternalFlingActive(); | 63 return delegate_->IsExternalFlingActive(); |
64 } | 64 } |
65 | 65 |
66 private: | 66 private: |
67 LayerImpl* layer_; | 67 LayerImpl* layer_; |
68 LayerScrollOffsetDelegate* delegate_; | 68 LayerScrollOffsetDelegate* delegate_; |
69 LayerTreeImpl* layer_tree_impl_; | 69 LayerTreeImpl* layer_tree_impl_; |
70 gfx::ScrollOffset last_set_scroll_offset_; | 70 gfx::ScrollOffset last_set_scroll_offset_; |
71 }; | 71 }; |
72 | 72 |
(...skipping 1423 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1496 page_scale, | 1496 page_scale, |
1497 duration.InSecondsF()); | 1497 duration.InSecondsF()); |
1498 } | 1498 } |
1499 } | 1499 } |
1500 | 1500 |
1501 scoped_ptr<PageScaleAnimation> LayerTreeImpl::TakePageScaleAnimation() { | 1501 scoped_ptr<PageScaleAnimation> LayerTreeImpl::TakePageScaleAnimation() { |
1502 return page_scale_animation_.Pass(); | 1502 return page_scale_animation_.Pass(); |
1503 } | 1503 } |
1504 | 1504 |
1505 } // namespace cc | 1505 } // namespace cc |
OLD | NEW |