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

Side by Side Diff: cc/test/fake_painted_scrollbar_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/fake_output_surface_client.h ('k') | cc/test/fake_picture_layer.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_PAINTED_SCROLLBAR_LAYER_H_ 5 #ifndef CC_TEST_FAKE_PAINTED_SCROLLBAR_LAYER_H_
6 #define CC_TEST_FAKE_PAINTED_SCROLLBAR_LAYER_H_ 6 #define CC_TEST_FAKE_PAINTED_SCROLLBAR_LAYER_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "cc/layers/painted_scrollbar_layer.h" 9 #include "cc/layers/painted_scrollbar_layer.h"
10 #include "cc/test/fake_scrollbar.h" 10 #include "cc/test/fake_scrollbar.h"
11 11
12 namespace base { template<typename T> class AutoReset; } 12 namespace base { template<typename T> class AutoReset; }
13 13
14 namespace cc { 14 namespace cc {
15 15
16 class FakePaintedScrollbarLayer : public PaintedScrollbarLayer { 16 class FakePaintedScrollbarLayer : public PaintedScrollbarLayer {
17 public: 17 public:
18 static scoped_refptr<FakePaintedScrollbarLayer> 18 static scoped_refptr<FakePaintedScrollbarLayer>
19 Create(bool paint_during_update, bool has_thumb, int scrolling_layer_id); 19 Create(bool paint_during_update, bool has_thumb, int scrolling_layer_id);
20 int update_count() const { return update_count_; } 20 int update_count() const { return update_count_; }
21 void reset_update_count() { update_count_ = 0; } 21 void reset_update_count() { update_count_ = 0; }
22 22
23 virtual bool Update(ResourceUpdateQueue* queue, 23 virtual bool Update(ResourceUpdateQueue* queue,
24 const OcclusionTracker<Layer>* occlusion) OVERRIDE; 24 const OcclusionTracker<Layer>* occlusion) override;
25 25
26 virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE; 26 virtual void PushPropertiesTo(LayerImpl* layer) override;
27 27
28 scoped_ptr<base::AutoReset<bool> > IgnoreSetNeedsCommit(); 28 scoped_ptr<base::AutoReset<bool> > IgnoreSetNeedsCommit();
29 29
30 size_t push_properties_count() const { return push_properties_count_; } 30 size_t push_properties_count() const { return push_properties_count_; }
31 void reset_push_properties_count() { push_properties_count_ = 0; } 31 void reset_push_properties_count() { push_properties_count_ = 0; }
32 32
33 // For unit tests 33 // For unit tests
34 UIResourceId track_resource_id() { 34 UIResourceId track_resource_id() {
35 return PaintedScrollbarLayer::track_resource_id(); 35 return PaintedScrollbarLayer::track_resource_id();
36 } 36 }
(...skipping 11 matching lines...) Expand all
48 virtual ~FakePaintedScrollbarLayer(); 48 virtual ~FakePaintedScrollbarLayer();
49 49
50 int update_count_; 50 int update_count_;
51 size_t push_properties_count_; 51 size_t push_properties_count_;
52 FakeScrollbar* fake_scrollbar_; 52 FakeScrollbar* fake_scrollbar_;
53 }; 53 };
54 54
55 } // namespace cc 55 } // namespace cc
56 56
57 #endif // CC_TEST_FAKE_PAINTED_SCROLLBAR_LAYER_H_ 57 #endif // CC_TEST_FAKE_PAINTED_SCROLLBAR_LAYER_H_
OLDNEW
« no previous file with comments | « cc/test/fake_output_surface_client.h ('k') | cc/test/fake_picture_layer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698