| 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();
|
| }
|
|
|
|
|