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

Side by Side Diff: cc/layers/ui_resource_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/tiled_layer_unittest.cc ('k') | cc/layers/ui_resource_layer.cc » ('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_UI_RESOURCE_LAYER_H_ 5 #ifndef CC_LAYERS_UI_RESOURCE_LAYER_H_
6 #define CC_LAYERS_UI_RESOURCE_LAYER_H_ 6 #define CC_LAYERS_UI_RESOURCE_LAYER_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.h" 10 #include "cc/layers/layer.h"
11 #include "cc/resources/ui_resource_client.h" 11 #include "cc/resources/ui_resource_client.h"
12 #include "ui/gfx/rect.h" 12 #include "ui/gfx/rect.h"
13 13
14 namespace cc { 14 namespace cc {
15 15
16 class LayerTreeHost; 16 class LayerTreeHost;
17 class ScopedUIResource; 17 class ScopedUIResource;
18 18
19 class CC_EXPORT UIResourceLayer : public Layer { 19 class CC_EXPORT UIResourceLayer : public Layer {
20 public: 20 public:
21 static scoped_refptr<UIResourceLayer> Create(); 21 static scoped_refptr<UIResourceLayer> Create();
22 22
23 virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE; 23 virtual void PushPropertiesTo(LayerImpl* layer) override;
24 24
25 virtual void SetLayerTreeHost(LayerTreeHost* host) OVERRIDE; 25 virtual void SetLayerTreeHost(LayerTreeHost* host) override;
26 26
27 void SetBitmap(const SkBitmap& skbitmap); 27 void SetBitmap(const SkBitmap& skbitmap);
28 28
29 // An alternative way of setting the resource to allow for sharing. 29 // An alternative way of setting the resource to allow for sharing.
30 void SetUIResourceId(UIResourceId resource_id); 30 void SetUIResourceId(UIResourceId resource_id);
31 31
32 // Sets a UV transform to be used at draw time. Defaults to (0, 0) and (1, 1). 32 // Sets a UV transform to be used at draw time. Defaults to (0, 0) and (1, 1).
33 void SetUV(const gfx::PointF& top_left, const gfx::PointF& bottom_right); 33 void SetUV(const gfx::PointF& top_left, const gfx::PointF& bottom_right);
34 34
35 // Sets an opacity value per vertex. It will be multiplied by the layer 35 // Sets an opacity value per vertex. It will be multiplied by the layer
36 // opacity value. 36 // opacity value.
37 void SetVertexOpacity(float bottom_left, 37 void SetVertexOpacity(float bottom_left,
38 float top_left, 38 float top_left,
39 float top_right, 39 float top_right,
40 float bottom_right); 40 float bottom_right);
41 41
42 class UIResourceHolder { 42 class UIResourceHolder {
43 public: 43 public:
44 virtual UIResourceId id() = 0; 44 virtual UIResourceId id() = 0;
45 virtual ~UIResourceHolder(); 45 virtual ~UIResourceHolder();
46 }; 46 };
47 47
48 protected: 48 protected:
49 UIResourceLayer(); 49 UIResourceLayer();
50 virtual ~UIResourceLayer(); 50 virtual ~UIResourceLayer();
51 51
52 virtual bool HasDrawableContent() const OVERRIDE; 52 virtual bool HasDrawableContent() const override;
53 53
54 scoped_ptr<UIResourceHolder> ui_resource_holder_; 54 scoped_ptr<UIResourceHolder> ui_resource_holder_;
55 SkBitmap bitmap_; 55 SkBitmap bitmap_;
56 56
57 gfx::PointF uv_top_left_; 57 gfx::PointF uv_top_left_;
58 gfx::PointF uv_bottom_right_; 58 gfx::PointF uv_bottom_right_;
59 float vertex_opacity_[4]; 59 float vertex_opacity_[4];
60 60
61 private: 61 private:
62 virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) 62 virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
63 OVERRIDE; 63 override;
64 void RecreateUIResourceHolder(); 64 void RecreateUIResourceHolder();
65 65
66 66
67 67
68 DISALLOW_COPY_AND_ASSIGN(UIResourceLayer); 68 DISALLOW_COPY_AND_ASSIGN(UIResourceLayer);
69 }; 69 };
70 70
71 } // namespace cc 71 } // namespace cc
72 72
73 #endif // CC_LAYERS_UI_RESOURCE_LAYER_H_ 73 #endif // CC_LAYERS_UI_RESOURCE_LAYER_H_
OLDNEW
« no previous file with comments | « cc/layers/tiled_layer_unittest.cc ('k') | cc/layers/ui_resource_layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698