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 d334e963c6d9ee4fe47895415667bf88bb860db4..e3785610eaca006d5994916b4c334d8ed9ca066b 100644 |
--- a/cc/trees/layer_tree_host_common_perftest.cc |
+++ b/cc/trees/layer_tree_host_common_perftest.cc |
@@ -50,7 +50,7 @@ class LayerTreeHostCommonPerfTest : public LayerTreeTest { |
ASSERT_TRUE(base::ReadFileToString(json_file, &json_)); |
} |
- virtual void SetupTree() OVERRIDE { |
+ virtual void SetupTree() override { |
gfx::Size viewport = gfx::Size(720, 1038); |
layer_tree_host()->SetViewportSize(viewport); |
scoped_refptr<Layer> root = |
@@ -61,7 +61,7 @@ class LayerTreeHostCommonPerfTest : public LayerTreeTest { |
void SetTestName(const std::string& name) { test_name_ = name; } |
- virtual void AfterTest() OVERRIDE { |
+ virtual void AfterTest() override { |
CHECK(!test_name_.empty()) << "Must SetTestName() before TearDown()."; |
perf_test::PrintResult("calc_draw_props_time", |
"", |
@@ -84,7 +84,7 @@ class CalcDrawPropsMainTest : public LayerTreeHostCommonPerfTest { |
RunTest(false, false, false); |
} |
- virtual void BeginTest() OVERRIDE { |
+ virtual void BeginTest() override { |
timer_.Reset(); |
do { |
@@ -121,11 +121,11 @@ class CalcDrawPropsImplTest : public LayerTreeHostCommonPerfTest { |
RunTestWithImplSidePainting(); |
} |
- virtual void BeginTest() OVERRIDE { |
+ virtual void BeginTest() override { |
PostSetNeedsCommitToMainThread(); |
} |
- virtual void DrawLayersOnThread(LayerTreeHostImpl* host_impl) OVERRIDE { |
+ virtual void DrawLayersOnThread(LayerTreeHostImpl* host_impl) override { |
timer_.Reset(); |
LayerTreeImpl* active_tree = host_impl->active_tree(); |
@@ -169,9 +169,9 @@ class LayerSorterMainTest : public CalcDrawPropsImplTest { |
public: |
void RunSortLayers() { RunTest(false, false, false); } |
- virtual void BeginTest() OVERRIDE { PostSetNeedsCommitToMainThread(); } |
+ virtual void BeginTest() override { PostSetNeedsCommitToMainThread(); } |
- virtual void DrawLayersOnThread(LayerTreeHostImpl* host_impl) OVERRIDE { |
+ virtual void DrawLayersOnThread(LayerTreeHostImpl* host_impl) override { |
LayerTreeImpl* active_tree = host_impl->active_tree(); |
// First build the tree and then we'll start running tests on layersorter |
// itself |
@@ -221,9 +221,9 @@ class BspTreePerfTest : public LayerSorterMainTest { |
num_duplicates_ = num_duplicates; |
} |
- virtual void BeginTest() OVERRIDE { PostSetNeedsCommitToMainThread(); } |
+ virtual void BeginTest() override { PostSetNeedsCommitToMainThread(); } |
- virtual void DrawLayersOnThread(LayerTreeHostImpl* host_impl) OVERRIDE { |
+ virtual void DrawLayersOnThread(LayerTreeHostImpl* host_impl) override { |
LayerTreeImpl* active_tree = host_impl->active_tree(); |
// First build the tree and then we'll start running tests on layersorter |
// itself |