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 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
235 gfx::ScrollOffsetWithDelta(scrollable_->scroll_offset(), delta)); | 235 gfx::ScrollOffsetWithDelta(scrollable_->scroll_offset(), delta)); |
236 } | 236 } |
237 | 237 |
238 private: | 238 private: |
239 scoped_refptr<Layer> scrollable_; | 239 scoped_refptr<Layer> scrollable_; |
240 }; | 240 }; |
241 | 241 |
242 TEST_F(ScrollingLayerTreePerfTest, LongScrollablePageSingleThread) { | 242 TEST_F(ScrollingLayerTreePerfTest, LongScrollablePageSingleThread) { |
243 SetTestName("long_scrollable_page"); | 243 SetTestName("long_scrollable_page"); |
244 ReadTestFile("long_scrollable_page"); | 244 ReadTestFile("long_scrollable_page"); |
| 245 // TODO(vollick): Remove verify_property_trees setting after |
| 246 // crbug.com/444219 is fixed. |
| 247 bool old_verify_property_trees = verify_property_trees(); |
| 248 set_verify_property_trees(false); |
245 RunTest(false, false, false); | 249 RunTest(false, false, false); |
| 250 set_verify_property_trees(old_verify_property_trees); |
246 } | 251 } |
247 | 252 |
248 TEST_F(ScrollingLayerTreePerfTest, LongScrollablePageThreadedImplSide) { | 253 TEST_F(ScrollingLayerTreePerfTest, LongScrollablePageThreadedImplSide) { |
249 SetTestName("long_scrollable_page_threaded_impl_side"); | 254 SetTestName("long_scrollable_page_threaded_impl_side"); |
250 ReadTestFile("long_scrollable_page"); | 255 ReadTestFile("long_scrollable_page"); |
| 256 // TODO(vollick): Remove verify_property_trees setting after |
| 257 // crbug.com/444219 is fixed. |
| 258 bool old_verify_property_trees = verify_property_trees(); |
| 259 set_verify_property_trees(false); |
251 RunTestWithImplSidePainting(); | 260 RunTestWithImplSidePainting(); |
| 261 set_verify_property_trees(old_verify_property_trees); |
252 } | 262 } |
253 | 263 |
254 static void EmptyReleaseCallback(uint32 sync_point, bool lost_resource) {} | 264 static void EmptyReleaseCallback(uint32 sync_point, bool lost_resource) {} |
255 | 265 |
256 // Simulates main-thread scrolling on each frame. | 266 // Simulates main-thread scrolling on each frame. |
257 class BrowserCompositorInvalidateLayerTreePerfTest | 267 class BrowserCompositorInvalidateLayerTreePerfTest |
258 : public LayerTreeHostPerfTestJsonReader { | 268 : public LayerTreeHostPerfTestJsonReader { |
259 public: | 269 public: |
260 BrowserCompositorInvalidateLayerTreePerfTest() | 270 BrowserCompositorInvalidateLayerTreePerfTest() |
261 : LayerTreeHostPerfTestJsonReader(), | 271 : LayerTreeHostPerfTestJsonReader(), |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
328 TEST_F(LayerTreeHostPerfTestJsonReader, HeavyPageThreadedImplSide) { | 338 TEST_F(LayerTreeHostPerfTestJsonReader, HeavyPageThreadedImplSide) { |
329 begin_frame_driven_drawing_ = true; | 339 begin_frame_driven_drawing_ = true; |
330 measure_commit_cost_ = true; | 340 measure_commit_cost_ = true; |
331 SetTestName("heavy_page"); | 341 SetTestName("heavy_page"); |
332 ReadTestFile("heavy_layer_tree"); | 342 ReadTestFile("heavy_layer_tree"); |
333 RunTestWithImplSidePainting(); | 343 RunTestWithImplSidePainting(); |
334 } | 344 } |
335 | 345 |
336 } // namespace | 346 } // namespace |
337 } // namespace cc | 347 } // namespace cc |
OLD | NEW |