| Index: cc/output/gl_renderer.cc
|
| diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
|
| index e8a2c9dbcca8b7ca2d04714088f2869a56b64b1f..61d233a4a7f17a26960ffc0e45cacfb4c9b1192e 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 {
|
| + void Set() override { has_passed_ = false; }
|
| + bool HasPassed() override {
|
| if (!has_passed_) {
|
| has_passed_ = true;
|
| Synchronize();
|
| @@ -66,7 +66,7 @@ class FallbackFence : public ResourceProvider::Fence {
|
| }
|
|
|
| private:
|
| - virtual ~FallbackFence() {}
|
| + ~FallbackFence() override {}
|
|
|
| void Synchronize() {
|
| TRACE_EVENT0("cc", "FallbackFence::Synchronize");
|
| @@ -251,16 +251,14 @@ class GLRenderer::SyncQuery {
|
| : query_(query) {}
|
|
|
| // Overridden from ResourceProvider::Fence:
|
| - virtual void Set() override {
|
| + void Set() override {
|
| DCHECK(query_);
|
| query_->Set();
|
| }
|
| - virtual bool HasPassed() override {
|
| - return !query_ || !query_->IsPending();
|
| - }
|
| + bool HasPassed() override { return !query_ || !query_->IsPending(); }
|
|
|
| private:
|
| - virtual ~Fence() {}
|
| + ~Fence() override {}
|
|
|
| base::WeakPtr<SyncQuery> query_;
|
|
|
|
|