Allow GLES2CmdDecoder to change the GLSurface associated with the default FBO.

content/common/gpu/image_transport_surface.cc

 // Copyright (c) 2012 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.
 
 #if defined(ENABLE_GPU)
 
 #include "content/common/gpu/image_transport_surface.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 154 matching lines @@
   scheduler->DeferToFence(task);
 }
 
 bool ImageTransportHelper::MakeCurrent() {
   gpu::gles2::GLES2Decoder* decoder = Decoder();
   if (!decoder)
     return false;
   return decoder->MakeCurrent();
 }
 
-void ImageTransportHelper::SetSwapInterval() {
+void ImageTransportHelper::SetSwapInterval(gfx::GLContext* context) {
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableGpuVsync))
-    Decoder()->GetGLContext()->SetSwapInterval(0);
+    context->SetSwapInterval(0);
   else
-    Decoder()->GetGLContext()->SetSwapInterval(1);
+    context->SetSwapInterval(1);
 }
 
 void ImageTransportHelper::Suspend() {
   manager_->Send(new GpuHostMsg_AcceleratedSurfaceSuspend(stub_->surface_id()));
 }
 
 gpu::GpuScheduler* ImageTransportHelper::Scheduler() {
   if (!stub_.get())
     return NULL;
   return stub_->scheduler();
@@ skipping 33 matching lines @@
 #endif
 
   surface_->OnResize(size);
 
 #if defined(OS_ANDROID)
   manager_->gpu_memory_manager()->ScheduleManage();
 #endif
 
 #if defined(OS_WIN)
   Decoder()->MakeCurrent();
-  SetSwapInterval();
+  SetSwapInterval(Decoder()->GetGLContext());
 #endif
 }
 
 PassThroughImageTransportSurface::PassThroughImageTransportSurface(
     GpuChannelManager* manager,
     GpuCommandBufferStub* stub,
     gfx::GLSurface* surface,
     bool transport)
     : GLSurfaceAdapter(surface),
       transport_(transport),
@@ skipping 47 matching lines @@
     params.height = height;
     helper_->SendAcceleratedSurfacePostSubBuffer(params);
 
     helper_->SetScheduled(false);
   }
   return result;
 }
 
 bool PassThroughImageTransportSurface::OnMakeCurrent(gfx::GLContext* context) {
   if (!did_set_swap_interval_) {
-    helper_->SetSwapInterval();
+    ImageTransportHelper::SetSwapInterval(context);
     did_set_swap_interval_ = true;
   }
   return true;
 }
 
 void PassThroughImageTransportSurface::OnNewSurfaceACK(
     uint64 surface_handle,
     TransportDIB::Handle shm_handle) {
 }
 
@@ skipping 21 matching lines @@
     helper_->SendResizeView(size);
     helper_->SetScheduled(false);
   } else {
     Resize(new_size_);
   }
 }
 
 PassThroughImageTransportSurface::~PassThroughImageTransportSurface() {}
 
 #endif  // defined(ENABLE_GPU)