Use ScopedMakeCurrent

content/browser/renderer_host/accelerated_surface_container_linux_cc.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/accelerated_surface_container_linux.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/renderer_host/image_transport_client.h"
 #include "ui/gfx/compositor/compositor_cc.h"
+#include "ui/gfx/gl/scoped_make_current.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/transform.h"
 
 namespace {
 
 class AcceleratedSurfaceContainerLinuxCC
     : public AcceleratedSurfaceContainerLinux, public ui::TextureCC {
  public:
   explicit AcceleratedSurfaceContainerLinuxCC(const gfx::Size& size)
       : size_(size),
@@ skipping 22 matching lines @@
       return false;
     }
     flipped_ = image_transport_client_->Flipped();
     return true;
   }
 
   // TextureCC implementation
   virtual void Update() OVERRIDE {
     ui::SharedResourcesCC* instance = ui::SharedResourcesCC::GetInstance();
     DCHECK(instance);
-    instance->MakeSharedContextCurrent();
+    scoped_ptr<gfx::ScopedMakeCurrent> bind(instance->GetScopedMakeCurrent());
     if (acquired_)
       image_transport_client_->Release();
     else
       acquired_ = true;
     image_transport_client_->Acquire();
   }
 
   virtual TransportDIB::Handle Handle() const {
     return image_transport_client_->Handle();
   }
 
   virtual ui::Texture* GetTexture() { return this; }
 
  private:
   scoped_ptr<ImageTransportClient> image_transport_client_;
   gfx::Size size_;
   bool acquired_;
   DISALLOW_COPY_AND_ASSIGN(AcceleratedSurfaceContainerLinuxCC);
 };
 
 }  // namespace
 
 // static
 AcceleratedSurfaceContainerLinux*
 AcceleratedSurfaceContainerLinux::Create(const gfx::Size& size) {
   return new AcceleratedSurfaceContainerLinuxCC(size);
 }