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

Side by Side Diff: cc/output/gl_renderer.cc

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/output/gl_renderer.h ('k') | cc/output/gl_renderer_unittest.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 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 #include "cc/output/gl_renderer.h" 5 #include "cc/output/gl_renderer.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 49
50 namespace cc { 50 namespace cc {
51 namespace { 51 namespace {
52 52
53 class FallbackFence : public ResourceProvider::Fence { 53 class FallbackFence : public ResourceProvider::Fence {
54 public: 54 public:
55 explicit FallbackFence(gpu::gles2::GLES2Interface* gl) 55 explicit FallbackFence(gpu::gles2::GLES2Interface* gl)
56 : gl_(gl), has_passed_(true) {} 56 : gl_(gl), has_passed_(true) {}
57 57
58 // Overridden from ResourceProvider::Fence: 58 // Overridden from ResourceProvider::Fence:
59 virtual void Set() OVERRIDE { has_passed_ = false; } 59 virtual void Set() override { has_passed_ = false; }
60 virtual bool HasPassed() OVERRIDE { 60 virtual bool HasPassed() override {
61 if (!has_passed_) { 61 if (!has_passed_) {
62 has_passed_ = true; 62 has_passed_ = true;
63 Synchronize(); 63 Synchronize();
64 } 64 }
65 return true; 65 return true;
66 } 66 }
67 67
68 private: 68 private:
69 virtual ~FallbackFence() {} 69 virtual ~FallbackFence() {}
70 70
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 is_pending_ = false; 244 is_pending_ = false;
245 } 245 }
246 246
247 private: 247 private:
248 class Fence : public ResourceProvider::Fence { 248 class Fence : public ResourceProvider::Fence {
249 public: 249 public:
250 explicit Fence(base::WeakPtr<GLRenderer::SyncQuery> query) 250 explicit Fence(base::WeakPtr<GLRenderer::SyncQuery> query)
251 : query_(query) {} 251 : query_(query) {}
252 252
253 // Overridden from ResourceProvider::Fence: 253 // Overridden from ResourceProvider::Fence:
254 virtual void Set() OVERRIDE { 254 virtual void Set() override {
255 DCHECK(query_); 255 DCHECK(query_);
256 query_->Set(); 256 query_->Set();
257 } 257 }
258 virtual bool HasPassed() OVERRIDE { 258 virtual bool HasPassed() override {
259 return !query_ || !query_->IsPending(); 259 return !query_ || !query_->IsPending();
260 } 260 }
261 261
262 private: 262 private:
263 virtual ~Fence() {} 263 virtual ~Fence() {}
264 264
265 base::WeakPtr<SyncQuery> query_; 265 base::WeakPtr<SyncQuery> query_;
266 266
267 DISALLOW_COPY_AND_ASSIGN(Fence); 267 DISALLOW_COPY_AND_ASSIGN(Fence);
268 }; 268 };
(...skipping 2954 matching lines...) Expand 10 before | Expand all | Expand 10 after
3223 context_support_->ScheduleOverlayPlane( 3223 context_support_->ScheduleOverlayPlane(
3224 overlay.plane_z_order, 3224 overlay.plane_z_order,
3225 overlay.transform, 3225 overlay.transform,
3226 pending_overlay_resources_.back()->texture_id(), 3226 pending_overlay_resources_.back()->texture_id(),
3227 overlay.display_rect, 3227 overlay.display_rect,
3228 overlay.uv_rect); 3228 overlay.uv_rect);
3229 } 3229 }
3230 } 3230 }
3231 3231
3232 } // namespace cc 3232 } // namespace cc
OLDNEW
« no previous file with comments | « cc/output/gl_renderer.h ('k') | cc/output/gl_renderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698