ContextProvider in OutputSurface

content/browser/aura/browser_compositor_output_surface.cc

 // Copyright (c) 2013 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/aura/browser_compositor_output_surface.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/strings/string_number_conversions.h"
 #include "cc/output/compositor_frame.h"
 #include "content/browser/aura/reflector_impl.h"
+#include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/compositor_switches.h"
 
 namespace content {
 
 BrowserCompositorOutputSurface::BrowserCompositorOutputSurface(
-    scoped_ptr<WebKit::WebGraphicsContext3D> context,
+    const scoped_refptr<ContextProviderCommandBuffer>& context_provider,
     int surface_id,
     IDMap<BrowserCompositorOutputSurface>* output_surface_map,
     base::MessageLoopProxy* compositor_message_loop,
     base::WeakPtr<ui::Compositor> compositor)
-    : OutputSurface(context.Pass()),
+    : OutputSurface(context_provider),
+      command_buffer_context_(context_provider->Context3d()),
       surface_id_(surface_id),
       output_surface_map_(output_surface_map),
       compositor_message_loop_(compositor_message_loop),
       compositor_(compositor) {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kUIMaxFramesPending)) {
     std::string string_value = command_line->GetSwitchValueASCII(
         switches::kUIMaxFramesPending);
     int int_value;
     if (base::StringToInt(string_value, &int_value))
@@ skipping 26 matching lines @@
 void BrowserCompositorOutputSurface::Reshape(gfx::Size size,
                                              float scale_factor) {
   OutputSurface::Reshape(size, scale_factor);
   if (reflector_.get())
     reflector_->OnReshape(size);
 }
 
 void BrowserCompositorOutputSurface::SwapBuffers(cc::CompositorFrame* frame) {
   DCHECK(frame->gl_frame_data);
 
-  WebGraphicsContext3DCommandBufferImpl* command_buffer =
-      static_cast<WebGraphicsContext3DCommandBufferImpl*>(context3d());
   CommandBufferProxyImpl* command_buffer_proxy =
-      command_buffer->GetCommandBufferProxy();
+      command_buffer_context_->GetCommandBufferProxy();
   DCHECK(command_buffer_proxy);
-  context3d()->shallowFlushCHROMIUM();
+  context_provider_->Context3d()->shallowFlushCHROMIUM();
   command_buffer_proxy->SetLatencyInfo(frame->metadata.latency_info);
 
   if (reflector_.get()) {
     if (frame->gl_frame_data->sub_buffer_rect ==
         gfx::Rect(frame->gl_frame_data->size))
       reflector_->OnSwapBuffers();
     else
       reflector_->OnPostSubBuffer(frame->gl_frame_data->sub_buffer_rect);
   }
 
@@ skipping 10 matching lines @@
       FROM_HERE,
       base::Bind(&ui::Compositor::OnUpdateVSyncParameters,
                  compositor_, timebase, interval));
 }
 
 void BrowserCompositorOutputSurface::SetReflector(ReflectorImpl* reflector) {
   reflector_ = reflector;
 }
 
 }  // namespace content