diff options
author | dcheng <dcheng@chromium.org> | 2014-10-21 02:51:08 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-21 09:51:37 +0000 |
commit | 716bedf160f4c4c1945cab54c3f490424a0eb779 (patch) | |
tree | c9592751a48527e3278a8a1e001b0569c97ff1d5 /cc/trees/layer_tree_host_unittest_picture.cc | |
parent | 6c879fbd35d14af9ca4fe53bc622edac2d3fd5f1 (diff) | |
download | chromium_src-716bedf160f4c4c1945cab54c3f490424a0eb779.zip chromium_src-716bedf160f4c4c1945cab54c3f490424a0eb779.tar.gz chromium_src-716bedf160f4c4c1945cab54c3f490424a0eb779.tar.bz2 |
Standardize usage of virtual/override/final in cc/
BUG=417463
TBR=enne@chromium.org
Review URL: https://codereview.chromium.org/645853008
Cr-Commit-Position: refs/heads/master@{#300439}
Diffstat (limited to 'cc/trees/layer_tree_host_unittest_picture.cc')
-rw-r--r-- | cc/trees/layer_tree_host_unittest_picture.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cc/trees/layer_tree_host_unittest_picture.cc b/cc/trees/layer_tree_host_unittest_picture.cc index a79d075..b81fdff 100644 --- a/cc/trees/layer_tree_host_unittest_picture.cc +++ b/cc/trees/layer_tree_host_unittest_picture.cc @@ -16,7 +16,7 @@ namespace { // These tests deal with picture layers. class LayerTreeHostPictureTest : public LayerTreeTest { protected: - virtual void InitializeSettings(LayerTreeSettings* settings) override { + void InitializeSettings(LayerTreeSettings* settings) override { // PictureLayer can only be used with impl side painting enabled. settings->impl_side_painting = true; } @@ -24,7 +24,7 @@ class LayerTreeHostPictureTest : public LayerTreeTest { class LayerTreeHostPictureTestTwinLayer : public LayerTreeHostPictureTest { - virtual void SetupTree() override { + void SetupTree() override { LayerTreeHostPictureTest::SetupTree(); scoped_refptr<FakePictureLayer> picture = @@ -32,12 +32,12 @@ class LayerTreeHostPictureTestTwinLayer layer_tree_host()->root_layer()->AddChild(picture); } - virtual void BeginTest() override { + void BeginTest() override { activates_ = 0; PostSetNeedsCommitToMainThread(); } - virtual void DidCommit() override { + void DidCommit() override { switch (layer_tree_host()->source_frame_number()) { case 2: // Drop the picture layer from the tree. @@ -52,7 +52,7 @@ class LayerTreeHostPictureTestTwinLayer } } - virtual void WillActivateTreeOnThread(LayerTreeHostImpl* impl) override { + void WillActivateTreeOnThread(LayerTreeHostImpl* impl) override { LayerImpl* pending_root_impl = impl->pending_tree()->root_layer(); LayerImpl* active_root_impl = impl->active_tree()->root_layer(); @@ -88,7 +88,7 @@ class LayerTreeHostPictureTestTwinLayer EXPECT_EQ(active_picture_impl, pending_picture_impl->twin_layer()); } - virtual void DidActivateTreeOnThread(LayerTreeHostImpl* impl) override { + void DidActivateTreeOnThread(LayerTreeHostImpl* impl) override { LayerImpl* active_root_impl = impl->active_tree()->root_layer(); if (active_root_impl->children().empty()) { @@ -107,7 +107,7 @@ class LayerTreeHostPictureTestTwinLayer EndTest(); } - virtual void AfterTest() override {} + void AfterTest() override {} FakeContentLayerClient client_; int activates_; |