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

Side by Side Diff: cc/test/fake_layer_tree_host.h

Issue 628443002: replace OVERRIDE and FINAL with override and final in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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 unified diff | Download patch
« no previous file with comments | « cc/test/fake_delegated_renderer_layer_impl.h ('k') | cc/test/fake_layer_tree_host_client.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef CC_TEST_FAKE_LAYER_TREE_HOST_H_ 5 #ifndef CC_TEST_FAKE_LAYER_TREE_HOST_H_
6 #define CC_TEST_FAKE_LAYER_TREE_HOST_H_ 6 #define CC_TEST_FAKE_LAYER_TREE_HOST_H_
7 7
8 #include "cc/debug/micro_benchmark_controller.h" 8 #include "cc/debug/micro_benchmark_controller.h"
9 #include "cc/test/fake_impl_proxy.h" 9 #include "cc/test/fake_impl_proxy.h"
10 #include "cc/test/fake_layer_tree_host_client.h" 10 #include "cc/test/fake_layer_tree_host_client.h"
11 #include "cc/test/fake_layer_tree_host_impl.h" 11 #include "cc/test/fake_layer_tree_host_impl.h"
12 #include "cc/test/test_shared_bitmap_manager.h" 12 #include "cc/test/test_shared_bitmap_manager.h"
13 #include "cc/trees/layer_tree_host.h" 13 #include "cc/trees/layer_tree_host.h"
14 #include "cc/trees/layer_tree_impl.h" 14 #include "cc/trees/layer_tree_impl.h"
15 #include "cc/trees/tree_synchronizer.h" 15 #include "cc/trees/tree_synchronizer.h"
16 16
17 namespace cc { 17 namespace cc {
18 18
19 class FakeLayerTreeHost : public LayerTreeHost { 19 class FakeLayerTreeHost : public LayerTreeHost {
20 public: 20 public:
21 static scoped_ptr<FakeLayerTreeHost> Create(FakeLayerTreeHostClient* client); 21 static scoped_ptr<FakeLayerTreeHost> Create(FakeLayerTreeHostClient* client);
22 static scoped_ptr<FakeLayerTreeHost> Create( 22 static scoped_ptr<FakeLayerTreeHost> Create(
23 FakeLayerTreeHostClient* client, 23 FakeLayerTreeHostClient* client,
24 const LayerTreeSettings& settings); 24 const LayerTreeSettings& settings);
25 25
26 virtual ~FakeLayerTreeHost(); 26 virtual ~FakeLayerTreeHost();
27 27
28 virtual void SetNeedsCommit() OVERRIDE; 28 virtual void SetNeedsCommit() override;
29 virtual void SetNeedsFullTreeSync() OVERRIDE {} 29 virtual void SetNeedsFullTreeSync() override {}
30 30
31 using LayerTreeHost::SetRootLayer; 31 using LayerTreeHost::SetRootLayer;
32 using LayerTreeHost::root_layer; 32 using LayerTreeHost::root_layer;
33 33
34 LayerImpl* CommitAndCreateLayerImplTree(); 34 LayerImpl* CommitAndCreateLayerImplTree();
35 35
36 FakeLayerTreeHostImpl* host_impl() { return &host_impl_; } 36 FakeLayerTreeHostImpl* host_impl() { return &host_impl_; }
37 LayerTreeImpl* active_tree() { return host_impl_.active_tree(); } 37 LayerTreeImpl* active_tree() { return host_impl_.active_tree(); }
38 38
39 using LayerTreeHost::ScheduleMicroBenchmark; 39 using LayerTreeHost::ScheduleMicroBenchmark;
(...skipping 18 matching lines...) Expand all
58 FakeImplProxy proxy_; 58 FakeImplProxy proxy_;
59 FakeLayerTreeHostClient* client_; 59 FakeLayerTreeHostClient* client_;
60 TestSharedBitmapManager manager_; 60 TestSharedBitmapManager manager_;
61 FakeLayerTreeHostImpl host_impl_; 61 FakeLayerTreeHostImpl host_impl_;
62 bool needs_commit_; 62 bool needs_commit_;
63 }; 63 };
64 64
65 } // namespace cc 65 } // namespace cc
66 66
67 #endif // CC_TEST_FAKE_LAYER_TREE_HOST_H_ 67 #endif // CC_TEST_FAKE_LAYER_TREE_HOST_H_
OLDNEW
« no previous file with comments | « cc/test/fake_delegated_renderer_layer_impl.h ('k') | cc/test/fake_layer_tree_host_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698