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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/gl_renderer.cc
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
index 0a897f39432a1cb94c3c4bc02805ac02de71d010..6d5bc44d1a43dc78e4fa45c08ef69a9a10ed12a0 100644
--- a/cc/output/gl_renderer.cc
+++ b/cc/output/gl_renderer.cc
@@ -56,8 +56,8 @@ class FallbackFence : public ResourceProvider::Fence {
: gl_(gl), has_passed_(true) {}
// Overridden from ResourceProvider::Fence:
- virtual void Set() OVERRIDE { has_passed_ = false; }
- virtual bool HasPassed() OVERRIDE {
+ virtual void Set() override { has_passed_ = false; }
+ virtual bool HasPassed() override {
if (!has_passed_) {
has_passed_ = true;
Synchronize();
@@ -251,11 +251,11 @@ class GLRenderer::SyncQuery {
: query_(query) {}
// Overridden from ResourceProvider::Fence:
- virtual void Set() OVERRIDE {
+ virtual void Set() override {
DCHECK(query_);
query_->Set();
}
- virtual bool HasPassed() OVERRIDE {
+ virtual bool HasPassed() override {
return !query_ || !query_->IsPending();
}
« 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