| 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_host_impl.h" | 5 #include "cc/trees/layer_tree_host_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 4164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4175 min_page_scale_factor_(-1.f), | 4175 min_page_scale_factor_(-1.f), |
| 4176 max_page_scale_factor_(-1.f), | 4176 max_page_scale_factor_(-1.f), |
| 4177 needs_animate_(false) {} | 4177 needs_animate_(false) {} |
| 4178 | 4178 |
| 4179 ~TestScrollOffsetDelegate() override {} | 4179 ~TestScrollOffsetDelegate() override {} |
| 4180 | 4180 |
| 4181 gfx::ScrollOffset GetTotalScrollOffset() override { | 4181 gfx::ScrollOffset GetTotalScrollOffset() override { |
| 4182 return getter_return_value_; | 4182 return getter_return_value_; |
| 4183 } | 4183 } |
| 4184 | 4184 |
| 4185 bool IsExternalScrollActive() const override { return false; } | |
| 4186 | |
| 4187 void SetNeedsAnimate(const AnimationCallback&) override { | 4185 void SetNeedsAnimate(const AnimationCallback&) override { |
| 4188 needs_animate_ = true; | 4186 needs_animate_ = true; |
| 4189 } | 4187 } |
| 4190 | 4188 |
| 4191 void UpdateRootLayerState(const gfx::ScrollOffset& total_scroll_offset, | 4189 void UpdateRootLayerState(const gfx::ScrollOffset& total_scroll_offset, |
| 4192 const gfx::ScrollOffset& max_scroll_offset, | 4190 const gfx::ScrollOffset& max_scroll_offset, |
| 4193 const gfx::SizeF& scrollable_size, | 4191 const gfx::SizeF& scrollable_size, |
| 4194 float page_scale_factor, | 4192 float page_scale_factor, |
| 4195 float min_page_scale_factor, | 4193 float min_page_scale_factor, |
| 4196 float max_page_scale_factor) override { | 4194 float max_page_scale_factor) override { |
| (...skipping 3996 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 8193 // Hold an unowned pointer to the output surface to use for mock expectations. | 8191 // Hold an unowned pointer to the output surface to use for mock expectations. |
| 8194 MockReclaimResourcesOutputSurface* mock_output_surface = output_surface.get(); | 8192 MockReclaimResourcesOutputSurface* mock_output_surface = output_surface.get(); |
| 8195 | 8193 |
| 8196 CreateHostImpl(DefaultSettings(), output_surface.Pass()); | 8194 CreateHostImpl(DefaultSettings(), output_surface.Pass()); |
| 8197 EXPECT_CALL(*mock_output_surface, ForceReclaimResources()).Times(1); | 8195 EXPECT_CALL(*mock_output_surface, ForceReclaimResources()).Times(1); |
| 8198 host_impl_->BeginCommit(); | 8196 host_impl_->BeginCommit(); |
| 8199 } | 8197 } |
| 8200 | 8198 |
| 8201 } // namespace | 8199 } // namespace |
| 8202 } // namespace cc | 8200 } // namespace cc |
| OLD | NEW |