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

Unified Diff: cc/trees/layer_tree_host_perftest.cc

Issue 839143002: Roll Chrome into Mojo. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Rebase Created 5 years, 11 months 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_impl.cc ('k') | cc/trees/layer_tree_host_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_perftest.cc
diff --git a/cc/trees/layer_tree_host_perftest.cc b/cc/trees/layer_tree_host_perftest.cc
index b368c558eb24aeb35a5f7b83fb703ccfc34aee10..c8e2a8c02c1ee5760000ffd3e3b7eaa5c3f3482f 100644
--- a/cc/trees/layer_tree_host_perftest.cc
+++ b/cc/trees/layer_tree_host_perftest.cc
@@ -242,13 +242,23 @@ class ScrollingLayerTreePerfTest : public LayerTreeHostPerfTestJsonReader {
TEST_F(ScrollingLayerTreePerfTest, LongScrollablePageSingleThread) {
SetTestName("long_scrollable_page");
ReadTestFile("long_scrollable_page");
+ // 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);
RunTest(false, false, false);
+ set_verify_property_trees(old_verify_property_trees);
}
TEST_F(ScrollingLayerTreePerfTest, LongScrollablePageThreadedImplSide) {
SetTestName("long_scrollable_page_threaded_impl_side");
ReadTestFile("long_scrollable_page");
+ // 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);
RunTestWithImplSidePainting();
+ set_verify_property_trees(old_verify_property_trees);
}
static void EmptyReleaseCallback(uint32 sync_point, bool lost_resource) {}
« no previous file with comments | « cc/trees/layer_tree_host_impl.cc ('k') | cc/trees/layer_tree_host_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698