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 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
148 } | 148 } |
149 bool IsInsideDraw() override { return false; } | 149 bool IsInsideDraw() override { return false; } |
150 void RenewTreePriority() override {} | 150 void RenewTreePriority() override {} |
151 void PostDelayedScrollbarFadeOnImplThread(const base::Closure& start_fade, | 151 void PostDelayedScrollbarFadeOnImplThread(const base::Closure& start_fade, |
152 base::TimeDelta delay) override { | 152 base::TimeDelta delay) override { |
153 scrollbar_fade_start_ = start_fade; | 153 scrollbar_fade_start_ = start_fade; |
154 requested_scrollbar_animation_delay_ = delay; | 154 requested_scrollbar_animation_delay_ = delay; |
155 } | 155 } |
156 void DidActivateSyncTree() override {} | 156 void DidActivateSyncTree() override {} |
157 void DidManageTiles() override {} | 157 void DidManageTiles() override {} |
| 158 void DidCompletePageScaleAnimationBeforeCommit() override {} |
158 | 159 |
159 void set_reduce_memory_result(bool reduce_memory_result) { | 160 void set_reduce_memory_result(bool reduce_memory_result) { |
160 reduce_memory_result_ = reduce_memory_result; | 161 reduce_memory_result_ = reduce_memory_result; |
161 } | 162 } |
162 | 163 |
163 bool CreateHostImpl(const LayerTreeSettings& settings, | 164 bool CreateHostImpl(const LayerTreeSettings& settings, |
164 scoped_ptr<OutputSurface> output_surface) { | 165 scoped_ptr<OutputSurface> output_surface) { |
165 host_impl_ = LayerTreeHostImpl::Create(settings, | 166 host_impl_ = LayerTreeHostImpl::Create(settings, |
166 this, | 167 this, |
167 &proxy_, | 168 &proxy_, |
(...skipping 7651 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
7819 // surface. | 7820 // surface. |
7820 EXPECT_EQ(0, num_lost_surfaces_); | 7821 EXPECT_EQ(0, num_lost_surfaces_); |
7821 host_impl_->DidLoseOutputSurface(); | 7822 host_impl_->DidLoseOutputSurface(); |
7822 EXPECT_EQ(1, num_lost_surfaces_); | 7823 EXPECT_EQ(1, num_lost_surfaces_); |
7823 host_impl_->DidLoseOutputSurface(); | 7824 host_impl_->DidLoseOutputSurface(); |
7824 EXPECT_LE(1, num_lost_surfaces_); | 7825 EXPECT_LE(1, num_lost_surfaces_); |
7825 } | 7826 } |
7826 | 7827 |
7827 } // namespace | 7828 } // namespace |
7828 } // namespace cc | 7829 } // namespace cc |
OLD | NEW |