Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(47)

Unified Diff: cc/trees/layer_tree_host_common_perftest.cc

Issue 817653003: Update from https://crrev.com/309717 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/trees/layer_tree_host_common.cc ('k') | cc/trees/layer_tree_host_common_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_common_perftest.cc
diff --git a/cc/trees/layer_tree_host_common_perftest.cc b/cc/trees/layer_tree_host_common_perftest.cc
index 812e2b417dfef76f5fcad01bb1ec02d5b8b1a84c..73d5c1d0d413db93dddcdee3f1194d5167967ac4 100644
--- a/cc/trees/layer_tree_host_common_perftest.cc
+++ b/cc/trees/layer_tree_host_common_perftest.cc
@@ -80,9 +80,7 @@ class LayerTreeHostCommonPerfTest : public LayerTreeTest {
class CalcDrawPropsMainTest : public LayerTreeHostCommonPerfTest {
public:
- void RunCalcDrawProps() {
- RunTest(false, false, false);
- }
+ void RunCalcDrawProps() { RunTest(false, false, false); }
void BeginTest() override {
timer_.Reset();
@@ -324,7 +322,12 @@ TEST_F(LayerSorterMainTest, LayerSorterCubes) {
TEST_F(LayerSorterMainTest, LayerSorterRubik) {
SetTestName("layer_sort_rubik");
ReadTestFile("layer_sort_rubik");
+ // TODO(vollick): Remove verify_property_trees setting after
+ // crbug.com/444219 is fixed.
+ bool old_verify_property_trees = verify_property_trees();
+ set_verify_property_trees(false);
RunSortLayers();
+ set_verify_property_trees(old_verify_property_trees);
}
TEST_F(BspTreePerfTest, BspTreeCubes) {
@@ -338,7 +341,12 @@ TEST_F(BspTreePerfTest, BspTreeRubik) {
SetTestName("bsp_tree_rubik");
SetNumberOfDuplicates(1);
ReadTestFile("layer_sort_rubik");
+ // TODO(vollick): Remove verify_property_trees setting after
+ // crbug.com/444219 is fixed.
+ bool old_verify_property_trees = verify_property_trees();
+ set_verify_property_trees(false);
RunSortLayers();
+ set_verify_property_trees(old_verify_property_trees);
}
TEST_F(BspTreePerfTest, BspTreeCubes_2) {
« no previous file with comments | « cc/trees/layer_tree_host_common.cc ('k') | cc/trees/layer_tree_host_common_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698