| Index: cc/trees/layer_tree_host_perftest.cc
|
| diff --git a/cc/trees/layer_tree_host_perftest.cc b/cc/trees/layer_tree_host_perftest.cc
|
| index 46074013b70489f94f7e49a7fedb6b5fde287b91..556ad63085cc97595e1411cab93813986fb8b5aa 100644
|
| --- a/cc/trees/layer_tree_host_perftest.cc
|
| +++ b/cc/trees/layer_tree_host_perftest.cc
|
| @@ -151,13 +151,13 @@ class LayerTreeHostPerfTestJsonReader : public LayerTreeHostPerfTest {
|
| TEST_F(LayerTreeHostPerfTestJsonReader, TenTenSingleThread) {
|
| SetTestName("10_10_single_thread");
|
| ReadTestFile("10_10_layer_tree");
|
| - RunTest(CompositorMode::SingleThreaded, false);
|
| + RunTest(CompositorMode::SINGLE_THREADED, false);
|
| }
|
|
|
| TEST_F(LayerTreeHostPerfTestJsonReader, TenTenThreaded) {
|
| SetTestName("10_10_threaded_impl_side");
|
| ReadTestFile("10_10_layer_tree");
|
| - RunTest(CompositorMode::Threaded, false);
|
| + RunTest(CompositorMode::THREADED, false);
|
| }
|
|
|
| // Simulates a tab switcher scene with two stacks of 10 tabs each.
|
| @@ -166,14 +166,14 @@ TEST_F(LayerTreeHostPerfTestJsonReader,
|
| full_damage_each_frame_ = true;
|
| SetTestName("10_10_single_thread_full_damage_each_frame");
|
| ReadTestFile("10_10_layer_tree");
|
| - RunTest(CompositorMode::SingleThreaded, false);
|
| + RunTest(CompositorMode::SINGLE_THREADED, false);
|
| }
|
|
|
| TEST_F(LayerTreeHostPerfTestJsonReader, TenTenThreaded_FullDamageEachFrame) {
|
| full_damage_each_frame_ = true;
|
| SetTestName("10_10_threaded_impl_side_full_damage_each_frame");
|
| ReadTestFile("10_10_layer_tree");
|
| - RunTest(CompositorMode::Threaded, false);
|
| + RunTest(CompositorMode::THREADED, false);
|
| }
|
|
|
| // Invalidates a leaf layer in the tree on the main thread after every commit.
|
| @@ -207,13 +207,13 @@ class LayerTreeHostPerfTestLeafInvalidates
|
| TEST_F(LayerTreeHostPerfTestLeafInvalidates, TenTenSingleThread) {
|
| SetTestName("10_10_single_thread_leaf_invalidates");
|
| ReadTestFile("10_10_layer_tree");
|
| - RunTest(CompositorMode::SingleThreaded, false);
|
| + RunTest(CompositorMode::SINGLE_THREADED, false);
|
| }
|
|
|
| TEST_F(LayerTreeHostPerfTestLeafInvalidates, TenTenThreaded) {
|
| SetTestName("10_10_threaded_impl_side_leaf_invalidates");
|
| ReadTestFile("10_10_layer_tree");
|
| - RunTest(CompositorMode::Threaded, false);
|
| + RunTest(CompositorMode::THREADED, false);
|
| }
|
|
|
| // Simulates main-thread scrolling on each frame.
|
| @@ -248,7 +248,7 @@ TEST_F(ScrollingLayerTreePerfTest, LongScrollablePageSingleThread) {
|
| // crbug.com/444219 is fixed.
|
| bool old_verify_property_trees = verify_property_trees();
|
| set_verify_property_trees(false);
|
| - RunTest(CompositorMode::SingleThreaded, false);
|
| + RunTest(CompositorMode::SINGLE_THREADED, false);
|
| set_verify_property_trees(old_verify_property_trees);
|
| }
|
|
|
| @@ -259,7 +259,7 @@ TEST_F(ScrollingLayerTreePerfTest, LongScrollablePageThreaded) {
|
| // crbug.com/444219 is fixed.
|
| bool old_verify_property_trees = verify_property_trees();
|
| set_verify_property_trees(false);
|
| - RunTest(CompositorMode::Threaded, false);
|
| + RunTest(CompositorMode::THREADED, false);
|
| set_verify_property_trees(old_verify_property_trees);
|
| }
|
|
|
| @@ -338,7 +338,7 @@ TEST_F(BrowserCompositorInvalidateLayerTreePerfTest, DenseBrowserUIThreaded) {
|
| measure_commit_cost_ = true;
|
| SetTestName("dense_layer_tree");
|
| ReadTestFile("dense_layer_tree");
|
| - RunTest(CompositorMode::Threaded, false);
|
| + RunTest(CompositorMode::THREADED, false);
|
| }
|
|
|
| // Simulates a page with several large, transformed and animated layers.
|
| @@ -347,7 +347,7 @@ TEST_F(LayerTreeHostPerfTestJsonReader, HeavyPageThreaded) {
|
| measure_commit_cost_ = true;
|
| SetTestName("heavy_page");
|
| ReadTestFile("heavy_layer_tree");
|
| - RunTest(CompositorMode::Threaded, false);
|
| + RunTest(CompositorMode::THREADED, false);
|
| }
|
|
|
| } // namespace
|
|
|