Adding support for VSyncProvider to the software drawing path

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(
     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_provider),
       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))
       capabilities_.max_frames_pending = int_value;
     else
       LOG(ERROR) << "Trouble parsing --" << switches::kUIMaxFramesPending;
   }
   capabilities_.adjust_deadline_for_parent = false;

[piman, 2013/11/07 00:45:12]

nit: Can we share this code between the 2 constructors? An Init function maybe?

[dnicoara, 2013/11/07 15:17:41]

Done.

-  DetachFromThread();
+}
+
+BrowserCompositorOutputSurface::BrowserCompositorOutputSurface(
+    scoped_ptr<cc::SoftwareOutputDevice> software_device,
+    int surface_id,
+    IDMap<BrowserCompositorOutputSurface>* output_surface_map,
+    base::MessageLoopProxy* compositor_message_loop,
+    base::WeakPtr<ui::Compositor> compositor)
+    : OutputSurface(software_device.Pass()),
+      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))
+      capabilities_.max_frames_pending = int_value;
+    else
+      LOG(ERROR) << "Trouble parsing --" << switches::kUIMaxFramesPending;
+  }
+  capabilities_.adjust_deadline_for_parent = false;
 }
 
 BrowserCompositorOutputSurface::~BrowserCompositorOutputSurface() {
   DCHECK(CalledOnValidThread());
   if (!HasClient())
     return;
   output_surface_map_->Remove(surface_id_);
 }
 
 bool BrowserCompositorOutputSurface::BindToClient(
     cc::OutputSurfaceClient* client) {
   DCHECK(CalledOnValidThread());
 
   if (!OutputSurface::BindToClient(client))
     return false;
 
   output_surface_map_->AddWithID(this, surface_id_);
   if (reflector_)
     reflector_->OnSourceSurfaceReady(surface_id_);
   return true;
 }
 
 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_context =
-      static_cast<WebGraphicsContext3DCommandBufferImpl*>(
-          context_provider_->Context3d());
-  CommandBufferProxyImpl* command_buffer_proxy =
-      command_buffer_context->GetCommandBufferProxy();
-  DCHECK(command_buffer_proxy);
-  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);
-  }
-
-  OutputSurface::SwapBuffers(frame);
-}
-
 void BrowserCompositorOutputSurface::OnUpdateVSyncParameters(
     base::TimeTicks timebase,
     base::TimeDelta interval) {
   DCHECK(CalledOnValidThread());
   DCHECK(HasClient());
   OnVSyncParametersChanged(timebase, interval);
   compositor_message_loop_->PostTask(
       FROM_HERE,
       base::Bind(&ui::Compositor::OnUpdateVSyncParameters,
                  compositor_, timebase, interval));
 }
 
 void BrowserCompositorOutputSurface::SetReflector(ReflectorImpl* reflector) {
   reflector_ = reflector;
 }
 
 }  // namespace content