| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include <deque> | 7 #include <deque> |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <sstream> | 9 #include <sstream> |
| 10 | 10 |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 scoped_refptr<Layer> root = | 52 scoped_refptr<Layer> root = |
| 53 ParseTreeFromJson(json_, &content_layer_client_); | 53 ParseTreeFromJson(json_, &content_layer_client_); |
| 54 ASSERT_TRUE(root.get()); | 54 ASSERT_TRUE(root.get()); |
| 55 layer_tree()->SetRootLayer(root); | 55 layer_tree()->SetRootLayer(root); |
| 56 content_layer_client_.set_bounds(viewport); | 56 content_layer_client_.set_bounds(viewport); |
| 57 } | 57 } |
| 58 | 58 |
| 59 void SetTestName(const std::string& name) { test_name_ = name; } | 59 void SetTestName(const std::string& name) { test_name_ = name; } |
| 60 | 60 |
| 61 void AfterTest() override { | 61 void AfterTest() override { |
| 62 CHECK(!test_name_.empty()) << "Must SetTestName() before TearDown()."; | 62 // Must SetTestName() before TearDown(). |
| 63 CHECK(!test_name_.empty()); |
| 63 perf_test::PrintResult("calc_draw_props_time", | 64 perf_test::PrintResult("calc_draw_props_time", |
| 64 "", | 65 "", |
| 65 test_name_, | 66 test_name_, |
| 66 1000 * timer_.MsPerLap(), | 67 1000 * timer_.MsPerLap(), |
| 67 "us", | 68 "us", |
| 68 true); | 69 true); |
| 69 } | 70 } |
| 70 | 71 |
| 71 protected: | 72 protected: |
| 72 FakeContentLayerClient content_layer_client_; | 73 FakeContentLayerClient content_layer_client_; |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 } | 142 } |
| 142 | 143 |
| 143 TEST_F(CalcDrawPropsTest, TouchRegionHeavy) { | 144 TEST_F(CalcDrawPropsTest, TouchRegionHeavy) { |
| 144 SetTestName("touch_region_heavy"); | 145 SetTestName("touch_region_heavy"); |
| 145 ReadTestFile("touch_region_heavy"); | 146 ReadTestFile("touch_region_heavy"); |
| 146 RunCalcDrawProps(); | 147 RunCalcDrawProps(); |
| 147 } | 148 } |
| 148 | 149 |
| 149 } // namespace | 150 } // namespace |
| 150 } // namespace cc | 151 } // namespace cc |
| OLD | NEW |