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/trees/layer_tree_host.h" | 5 #include "cc/trees/layer_tree_host.h" |
6 | 6 |
7 #include <sstream> | 7 #include <sstream> |
8 | 8 |
9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
224 virtual void BuildTree() OVERRIDE { | 224 virtual void BuildTree() OVERRIDE { |
225 LayerTreeHostPerfTestJsonReader::BuildTree(); | 225 LayerTreeHostPerfTestJsonReader::BuildTree(); |
226 scrollable_ = layer_tree_host()->root_layer()->children()[1]; | 226 scrollable_ = layer_tree_host()->root_layer()->children()[1]; |
227 ASSERT_TRUE(scrollable_.get()); | 227 ASSERT_TRUE(scrollable_.get()); |
228 } | 228 } |
229 | 229 |
230 virtual void Layout() OVERRIDE { | 230 virtual void Layout() OVERRIDE { |
231 if (TestEnded()) | 231 if (TestEnded()) |
232 return; | 232 return; |
233 static const gfx::Vector2d delta = gfx::Vector2d(0, 10); | 233 static const gfx::Vector2d delta = gfx::Vector2d(0, 10); |
234 scrollable_->SetScrollOffset(scrollable_->scroll_offset() + delta); | 234 scrollable_->SetScrollOffset( |
| 235 gfx::ScrollOffsetWithDelta(scrollable_->scroll_offset(), delta)); |
235 } | 236 } |
236 | 237 |
237 private: | 238 private: |
238 scoped_refptr<Layer> scrollable_; | 239 scoped_refptr<Layer> scrollable_; |
239 }; | 240 }; |
240 | 241 |
241 TEST_F(ScrollingLayerTreePerfTest, LongScrollablePageSingleThread) { | 242 TEST_F(ScrollingLayerTreePerfTest, LongScrollablePageSingleThread) { |
242 SetTestName("long_scrollable_page"); | 243 SetTestName("long_scrollable_page"); |
243 ReadTestFile("long_scrollable_page"); | 244 ReadTestFile("long_scrollable_page"); |
244 RunTest(false, false, false); | 245 RunTest(false, false, false); |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
328 TEST_F(LayerTreeHostPerfTestJsonReader, HeavyPageThreadedImplSide) { | 329 TEST_F(LayerTreeHostPerfTestJsonReader, HeavyPageThreadedImplSide) { |
329 begin_frame_driven_drawing_ = true; | 330 begin_frame_driven_drawing_ = true; |
330 measure_commit_cost_ = true; | 331 measure_commit_cost_ = true; |
331 SetTestName("heavy_page"); | 332 SetTestName("heavy_page"); |
332 ReadTestFile("heavy_layer_tree"); | 333 ReadTestFile("heavy_layer_tree"); |
333 RunTestWithImplSidePainting(); | 334 RunTestWithImplSidePainting(); |
334 } | 335 } |
335 | 336 |
336 } // namespace | 337 } // namespace |
337 } // namespace cc | 338 } // namespace cc |
OLD | NEW |