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

Side by Side Diff: cc/test/fake_content_layer.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/cc_test_suite.h ('k') | cc/test/fake_content_layer_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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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_CONTENT_LAYER_H_ 5 #ifndef CC_TEST_FAKE_CONTENT_LAYER_H_
6 #define CC_TEST_FAKE_CONTENT_LAYER_H_ 6 #define CC_TEST_FAKE_CONTENT_LAYER_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "cc/layers/content_layer.h" 9 #include "cc/layers/content_layer.h"
10 10
11 namespace cc { 11 namespace cc {
12 12
13 class FakeContentLayer : public ContentLayer { 13 class FakeContentLayer : public ContentLayer {
14 public: 14 public:
15 static scoped_refptr<FakeContentLayer> Create(ContentLayerClient* client) { 15 static scoped_refptr<FakeContentLayer> Create(ContentLayerClient* client) {
16 return make_scoped_refptr(new FakeContentLayer(client)); 16 return make_scoped_refptr(new FakeContentLayer(client));
17 } 17 }
18 18
19 virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) 19 virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
20 OVERRIDE; 20 override;
21 21
22 size_t update_count() const { return update_count_; } 22 size_t update_count() const { return update_count_; }
23 void reset_update_count() { update_count_ = 0; } 23 void reset_update_count() { update_count_ = 0; }
24 24
25 size_t push_properties_count() const { return push_properties_count_; } 25 size_t push_properties_count() const { return push_properties_count_; }
26 void reset_push_properties_count() { push_properties_count_ = 0; } 26 void reset_push_properties_count() { push_properties_count_ = 0; }
27 27
28 virtual bool Update(ResourceUpdateQueue* queue, 28 virtual bool Update(ResourceUpdateQueue* queue,
29 const OcclusionTracker<Layer>* occlusion) OVERRIDE; 29 const OcclusionTracker<Layer>* occlusion) override;
30 30
31 gfx::Rect LastPaintRect() const; 31 gfx::Rect LastPaintRect() const;
32 32
33 void set_always_update_resources(bool always_update_resources) { 33 void set_always_update_resources(bool always_update_resources) {
34 always_update_resources_ = always_update_resources; 34 always_update_resources_ = always_update_resources;
35 } 35 }
36 36
37 virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE; 37 virtual void PushPropertiesTo(LayerImpl* layer) override;
38 38
39 virtual void OnOutputSurfaceCreated() OVERRIDE; 39 virtual void OnOutputSurfaceCreated() override;
40 size_t output_surface_created_count() const { 40 size_t output_surface_created_count() const {
41 return output_surface_created_count_; 41 return output_surface_created_count_;
42 } 42 }
43 43
44 bool HaveBackingAt(int i, int j); 44 bool HaveBackingAt(int i, int j);
45 45
46 private: 46 private:
47 explicit FakeContentLayer(ContentLayerClient* client); 47 explicit FakeContentLayer(ContentLayerClient* client);
48 virtual ~FakeContentLayer(); 48 virtual ~FakeContentLayer();
49 49
50 size_t update_count_; 50 size_t update_count_;
51 size_t push_properties_count_; 51 size_t push_properties_count_;
52 size_t output_surface_created_count_; 52 size_t output_surface_created_count_;
53 bool always_update_resources_; 53 bool always_update_resources_;
54 }; 54 };
55 55
56 } // namespace cc 56 } // namespace cc
57 57
58 #endif // CC_TEST_FAKE_CONTENT_LAYER_H_ 58 #endif // CC_TEST_FAKE_CONTENT_LAYER_H_
OLDNEW
« no previous file with comments | « cc/test/cc_test_suite.h ('k') | cc/test/fake_content_layer_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698