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

Side by Side Diff: cc/layers/picture_image_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/picture_image_layer.h ('k') | cc/layers/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_LAYERS_PICTURE_IMAGE_LAYER_IMPL_H_ 5 #ifndef CC_LAYERS_PICTURE_IMAGE_LAYER_IMPL_H_
6 #define CC_LAYERS_PICTURE_IMAGE_LAYER_IMPL_H_ 6 #define CC_LAYERS_PICTURE_IMAGE_LAYER_IMPL_H_
7 7
8 #include "cc/layers/picture_layer_impl.h" 8 #include "cc/layers/picture_layer_impl.h"
9 9
10 namespace cc { 10 namespace cc {
11 11
12 class CC_EXPORT PictureImageLayerImpl : public PictureLayerImpl { 12 class CC_EXPORT PictureImageLayerImpl : public PictureLayerImpl {
13 public: 13 public:
14 static scoped_ptr<PictureImageLayerImpl> Create(LayerTreeImpl* tree_impl, 14 static scoped_ptr<PictureImageLayerImpl> Create(LayerTreeImpl* tree_impl,
15 int id) { 15 int id) {
16 return make_scoped_ptr(new PictureImageLayerImpl(tree_impl, id)); 16 return make_scoped_ptr(new PictureImageLayerImpl(tree_impl, id));
17 } 17 }
18 virtual ~PictureImageLayerImpl(); 18 virtual ~PictureImageLayerImpl();
19 19
20 // LayerImpl overrides. 20 // LayerImpl overrides.
21 virtual const char* LayerTypeAsString() const OVERRIDE; 21 virtual const char* LayerTypeAsString() const override;
22 virtual scoped_ptr<LayerImpl> CreateLayerImpl( 22 virtual scoped_ptr<LayerImpl> CreateLayerImpl(
23 LayerTreeImpl* tree_impl) OVERRIDE; 23 LayerTreeImpl* tree_impl) override;
24 24
25 protected: 25 protected:
26 PictureImageLayerImpl(LayerTreeImpl* tree_impl, int id); 26 PictureImageLayerImpl(LayerTreeImpl* tree_impl, int id);
27 27
28 virtual bool ShouldAdjustRasterScale() const OVERRIDE; 28 virtual bool ShouldAdjustRasterScale() const override;
29 virtual void RecalculateRasterScales() OVERRIDE; 29 virtual void RecalculateRasterScales() override;
30 virtual void GetDebugBorderProperties( 30 virtual void GetDebugBorderProperties(
31 SkColor* color, float* width) const OVERRIDE; 31 SkColor* color, float* width) const override;
32 32
33 virtual void UpdateIdealScales() OVERRIDE; 33 virtual void UpdateIdealScales() override;
34 34
35 private: 35 private:
36 DISALLOW_COPY_AND_ASSIGN(PictureImageLayerImpl); 36 DISALLOW_COPY_AND_ASSIGN(PictureImageLayerImpl);
37 }; 37 };
38 38
39 } // namespace cc 39 } // namespace cc
40 40
41 #endif // CC_LAYERS_PICTURE_IMAGE_LAYER_IMPL_H_ 41 #endif // CC_LAYERS_PICTURE_IMAGE_LAYER_IMPL_H_
OLDNEW
« no previous file with comments | « cc/layers/picture_image_layer.h ('k') | cc/layers/picture_layer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698