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

Side by Side Diff: cc/layers/surface_layer_impl.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/layers/surface_layer.h ('k') | cc/layers/texture_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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_LAYERS_SURFACE_LAYER_IMPL_H_ 5 #ifndef CC_LAYERS_SURFACE_LAYER_IMPL_H_
6 #define CC_LAYERS_SURFACE_LAYER_IMPL_H_ 6 #define CC_LAYERS_SURFACE_LAYER_IMPL_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "cc/base/cc_export.h" 9 #include "cc/base/cc_export.h"
10 #include "cc/layers/layer_impl.h" 10 #include "cc/layers/layer_impl.h"
11 #include "cc/surfaces/surface_id.h" 11 #include "cc/surfaces/surface_id.h"
12 12
13 namespace cc { 13 namespace cc {
14 14
15 class CC_EXPORT SurfaceLayerImpl : public LayerImpl { 15 class CC_EXPORT SurfaceLayerImpl : public LayerImpl {
16 public: 16 public:
17 static scoped_ptr<SurfaceLayerImpl> Create(LayerTreeImpl* tree_impl, int id) { 17 static scoped_ptr<SurfaceLayerImpl> Create(LayerTreeImpl* tree_impl, int id) {
18 return make_scoped_ptr(new SurfaceLayerImpl(tree_impl, id)); 18 return make_scoped_ptr(new SurfaceLayerImpl(tree_impl, id));
19 } 19 }
20 virtual ~SurfaceLayerImpl(); 20 virtual ~SurfaceLayerImpl();
21 21
22 void SetSurfaceId(SurfaceId surface_id); 22 void SetSurfaceId(SurfaceId surface_id);
23 23
24 // LayerImpl overrides. 24 // LayerImpl overrides.
25 virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) 25 virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
26 OVERRIDE; 26 override;
27 virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE; 27 virtual void PushPropertiesTo(LayerImpl* layer) override;
28 virtual void AppendQuads(RenderPass* render_pass, 28 virtual void AppendQuads(RenderPass* render_pass,
29 const OcclusionTracker<LayerImpl>& occlusion_tracker, 29 const OcclusionTracker<LayerImpl>& occlusion_tracker,
30 AppendQuadsData* append_quads_data) OVERRIDE; 30 AppendQuadsData* append_quads_data) override;
31 31
32 protected: 32 protected:
33 SurfaceLayerImpl(LayerTreeImpl* tree_impl, int id); 33 SurfaceLayerImpl(LayerTreeImpl* tree_impl, int id);
34 34
35 private: 35 private:
36 virtual void GetDebugBorderProperties(SkColor* color, 36 virtual void GetDebugBorderProperties(SkColor* color,
37 float* width) const OVERRIDE; 37 float* width) const override;
38 virtual void AsValueInto(base::debug::TracedValue* dict) const OVERRIDE; 38 virtual void AsValueInto(base::debug::TracedValue* dict) const override;
39 virtual const char* LayerTypeAsString() const OVERRIDE; 39 virtual const char* LayerTypeAsString() const override;
40 40
41 SurfaceId surface_id_; 41 SurfaceId surface_id_;
42 42
43 DISALLOW_COPY_AND_ASSIGN(SurfaceLayerImpl); 43 DISALLOW_COPY_AND_ASSIGN(SurfaceLayerImpl);
44 }; 44 };
45 45
46 } // namespace cc 46 } // namespace cc
47 47
48 #endif // CC_LAYERS_SURFACE_LAYER_IMPL_H_ 48 #endif // CC_LAYERS_SURFACE_LAYER_IMPL_H_
OLDNEW
« no previous file with comments | « cc/layers/surface_layer.h ('k') | cc/layers/texture_layer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698