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

Side by Side Diff: gpu/tools/compositor_model_bench/render_tree.h

Issue 629913002: Replacing the OVERRIDE with override and FINAL with final in gpu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Included autogen python file for OVERRIDE 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 | « gpu/tools/compositor_model_bench/render_model_utils.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 // Data structures for representing parts of Chromium's composited layer tree 5 // Data structures for representing parts of Chromium's composited layer tree
6 // and a function to load it from the JSON configuration file 6 // and a function to load it from the JSON configuration file
7 7
8 #ifndef GPU_TOOLS_COMPOSITOR_MODEL_BENCH_RENDER_TREE_H_ 8 #ifndef GPU_TOOLS_COMPOSITOR_MODEL_BENCH_RENDER_TREE_H_
9 #define GPU_TOOLS_COMPOSITOR_MODEL_BENCH_RENDER_TREE_H_ 9 #define GPU_TOOLS_COMPOSITOR_MODEL_BENCH_RENDER_TREE_H_
10 10
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 float transform_[16]; 130 float transform_[16];
131 std::vector<Tile> tiles_; 131 std::vector<Tile> tiles_;
132 int tile_width_; 132 int tile_width_;
133 int tile_height_; 133 int tile_height_;
134 }; 134 };
135 135
136 class ContentLayerNode : public RenderNode { 136 class ContentLayerNode : public RenderNode {
137 public: 137 public:
138 ContentLayerNode(); 138 ContentLayerNode();
139 virtual ~ContentLayerNode(); 139 virtual ~ContentLayerNode();
140 virtual void Accept(RenderNodeVisitor* v) OVERRIDE; 140 virtual void Accept(RenderNodeVisitor* v) override;
141 141
142 void set_skipsDraw(bool skips) { 142 void set_skipsDraw(bool skips) {
143 skipsDraw_ = skips; 143 skipsDraw_ = skips;
144 } 144 }
145 145
146 void add_child(RenderNode* child) { 146 void add_child(RenderNode* child) {
147 children_.push_back(child); 147 children_.push_back(child);
148 } 148 }
149 149
150 private: 150 private:
151 ScopedVector<RenderNode> children_; 151 ScopedVector<RenderNode> children_;
152 bool skipsDraw_; 152 bool skipsDraw_;
153 }; 153 };
154 154
155 class CCNode : public RenderNode { 155 class CCNode : public RenderNode {
156 public: 156 public:
157 CCNode(); 157 CCNode();
158 virtual ~CCNode(); 158 virtual ~CCNode();
159 159
160 virtual void Accept(RenderNodeVisitor* v) OVERRIDE; 160 virtual void Accept(RenderNodeVisitor* v) override;
161 161
162 ShaderID vertex_shader() { 162 ShaderID vertex_shader() {
163 return vertex_shader_; 163 return vertex_shader_;
164 } 164 }
165 165
166 void set_vertex_shader(ShaderID shader) { 166 void set_vertex_shader(ShaderID shader) {
167 vertex_shader_ = shader; 167 vertex_shader_ = shader;
168 } 168 }
169 169
170 ShaderID fragment_shader() { 170 ShaderID fragment_shader() {
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 virtual void BeginVisitCCNode(CCNode* v); 202 virtual void BeginVisitCCNode(CCNode* v);
203 virtual void EndVisitRenderNode(RenderNode* v); 203 virtual void EndVisitRenderNode(RenderNode* v);
204 virtual void EndVisitContentLayerNode(ContentLayerNode* v); 204 virtual void EndVisitContentLayerNode(ContentLayerNode* v);
205 virtual void EndVisitCCNode(CCNode* v); 205 virtual void EndVisitCCNode(CCNode* v);
206 }; 206 };
207 207
208 RenderNode* BuildRenderTreeFromFile(const base::FilePath& path); 208 RenderNode* BuildRenderTreeFromFile(const base::FilePath& path);
209 209
210 #endif // GPU_TOOLS_COMPOSITOR_MODEL_BENCH_RENDER_TREE_H_ 210 #endif // GPU_TOOLS_COMPOSITOR_MODEL_BENCH_RENDER_TREE_H_
211 211
OLDNEW
« no previous file with comments | « gpu/tools/compositor_model_bench/render_model_utils.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698