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

Side by Side Diff: cc/layers/image_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/layers/heads_up_display_unittest.cc ('k') | cc/layers/io_surface_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 2010 The Chromium Authors. All rights reserved. 1 // Copyright 2010 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_IMAGE_LAYER_H_ 5 #ifndef CC_LAYERS_IMAGE_LAYER_H_
6 #define CC_LAYERS_IMAGE_LAYER_H_ 6 #define CC_LAYERS_IMAGE_LAYER_H_
7 7
8 #include "cc/base/cc_export.h" 8 #include "cc/base/cc_export.h"
9 #include "cc/layers/content_layer.h" 9 #include "cc/layers/content_layer.h"
10 #include "third_party/skia/include/core/SkBitmap.h" 10 #include "third_party/skia/include/core/SkBitmap.h"
11 11
12 namespace cc { 12 namespace cc {
13 13
14 class ImageLayerUpdater; 14 class ImageLayerUpdater;
15 15
16 // A Layer that contains only an Image element. 16 // A Layer that contains only an Image element.
17 class CC_EXPORT ImageLayer : public TiledLayer { 17 class CC_EXPORT ImageLayer : public TiledLayer {
18 public: 18 public:
19 static scoped_refptr<ImageLayer> Create(); 19 static scoped_refptr<ImageLayer> Create();
20 20
21 // Layer implementation. 21 // Layer implementation.
22 virtual void SetTexturePriorities(const PriorityCalculator& priority_calc) 22 virtual void SetTexturePriorities(const PriorityCalculator& priority_calc)
23 OVERRIDE; 23 override;
24 virtual bool Update(ResourceUpdateQueue* queue, 24 virtual bool Update(ResourceUpdateQueue* queue,
25 const OcclusionTracker<Layer>* occlusion) OVERRIDE; 25 const OcclusionTracker<Layer>* occlusion) override;
26 virtual void CalculateContentsScale(float ideal_contents_scale, 26 virtual void CalculateContentsScale(float ideal_contents_scale,
27 float* contents_scale_x, 27 float* contents_scale_x,
28 float* contents_scale_y, 28 float* contents_scale_y,
29 gfx::Size* content_bounds) OVERRIDE; 29 gfx::Size* content_bounds) override;
30 virtual void OnOutputSurfaceCreated() OVERRIDE; 30 virtual void OnOutputSurfaceCreated() override;
31 31
32 void SetBitmap(const SkBitmap& image); 32 void SetBitmap(const SkBitmap& image);
33 33
34 protected: 34 protected:
35 virtual bool HasDrawableContent() const OVERRIDE; 35 virtual bool HasDrawableContent() const override;
36 36
37 private: 37 private:
38 ImageLayer(); 38 ImageLayer();
39 virtual ~ImageLayer(); 39 virtual ~ImageLayer();
40 40
41 // TiledLayer Implementation. 41 // TiledLayer Implementation.
42 virtual LayerUpdater* Updater() const OVERRIDE; 42 virtual LayerUpdater* Updater() const override;
43 virtual void CreateUpdaterIfNeeded() OVERRIDE; 43 virtual void CreateUpdaterIfNeeded() override;
44 44
45 float ImageContentsScaleX() const; 45 float ImageContentsScaleX() const;
46 float ImageContentsScaleY() const; 46 float ImageContentsScaleY() const;
47 47
48 SkBitmap bitmap_; 48 SkBitmap bitmap_;
49 49
50 scoped_refptr<ImageLayerUpdater> updater_; 50 scoped_refptr<ImageLayerUpdater> updater_;
51 51
52 DISALLOW_COPY_AND_ASSIGN(ImageLayer); 52 DISALLOW_COPY_AND_ASSIGN(ImageLayer);
53 }; 53 };
54 54
55 } // namespace cc 55 } // namespace cc
56 56
57 #endif // CC_LAYERS_IMAGE_LAYER_H_ 57 #endif // CC_LAYERS_IMAGE_LAYER_H_
OLDNEW
« no previous file with comments | « cc/layers/heads_up_display_unittest.cc ('k') | cc/layers/io_surface_layer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698