| Index: ui/compositor/compositor.cc
|
| diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
|
| index bff9e8b6b85ba9bce20b8fc19687cf1df89ea491..47b725839f07647be10be9ccd8f32b5b6d175ea6 100644
|
| --- a/ui/compositor/compositor.cc
|
| +++ b/ui/compositor/compositor.cc
|
| @@ -128,13 +128,15 @@ class ContextProviderFromContextFactory : public cc::ContextProvider {
|
| return !!context3d_;
|
| }
|
|
|
| - virtual bool BindToCurrentThread() {
|
| + virtual bool BindToCurrentThread() OVERRIDE {
|
| return context3d_->makeContextCurrent();
|
| }
|
|
|
| - virtual WebKit::WebGraphicsContext3D* Context3d() { return context3d_.get(); }
|
| + virtual WebKit::WebGraphicsContext3D* Context3d() OVERRIDE {
|
| + return context3d_.get();
|
| + }
|
|
|
| - virtual class GrContext* GrContext() {
|
| + virtual class GrContext* GrContext() OVERRIDE {
|
| if (!gr_context_) {
|
| gr_context_.reset(
|
| new webkit::gpu::GrContextForWebGraphicsContext3D(context3d_.get()));
|
| @@ -149,7 +151,7 @@ class ContextProviderFromContextFactory : public cc::ContextProvider {
|
| destroyed_ = true;
|
| }
|
|
|
| - bool DestroyedOnMainThread() {
|
| + virtual bool DestroyedOnMainThread() OVERRIDE {
|
| base::AutoLock lock(destroyed_lock_);
|
| return destroyed_;
|
| }
|
|
|