Unified OutputSurface::SwapBuffers.

content/browser/renderer_host/image_transport_factory.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.
 
 #include "content/browser/renderer_host/image_transport_factory.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/threading/non_thread_safe.h"
+#include "cc/output/compositor_frame.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/output_surface_client.h"
 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/common/gpu/client/gl_helper.h"
 #include "content/common/gpu/client/gpu_channel_host.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
@@ skipping 505 matching lines @@
         base::Bind(&ui::Compositor::OnUpdateVSyncParameters,
                    compositor_, timebase, interval));
   }
 
   virtual void Reshape(gfx::Size size, float scale_factor) OVERRIDE {
     OutputSurface::Reshape(size, scale_factor);
     if (reflector_.get())
       reflector_->OnReshape(size);
   }
 
-  virtual void SwapBuffers(const ui::LatencyInfo& latency_info) OVERRIDE {
+  virtual void SwapBuffers(cc::CompositorFrame* frame) OVERRIDE {
+    DCHECK(frame->gl_frame_data);
+
     WebGraphicsContext3DCommandBufferImpl* command_buffer =
         static_cast<WebGraphicsContext3DCommandBufferImpl*>(context3d());
     CommandBufferProxyImpl* command_buffer_proxy =
         command_buffer->GetCommandBufferProxy();
     DCHECK(command_buffer_proxy);
     context3d()->shallowFlushCHROMIUM();
-    command_buffer_proxy->SetLatencyInfo(latency_info);
+    command_buffer_proxy->SetLatencyInfo(frame->metadata.latency_info);
 
-    if (reflector_.get())
-      reflector_->OnSwapBuffers();
+    if (reflector_.get()) {
+      if (frame->gl_frame_data->partial_swap_allowed)
+        reflector_->OnPostSubBuffer(frame->gl_frame_data->sub_buffer_rect);
+      else
+        reflector_->OnSwapBuffers();
+    }
 
-    OutputSurface::SwapBuffers(latency_info);
-  }
-
-  virtual void PostSubBuffer(gfx::Rect rect,
-                             const ui::LatencyInfo& latency_info) OVERRIDE {
-    WebGraphicsContext3DCommandBufferImpl* command_buffer =
-        static_cast<WebGraphicsContext3DCommandBufferImpl*>(context3d());
-    CommandBufferProxyImpl* command_buffer_proxy =
-        command_buffer->GetCommandBufferProxy();
-    DCHECK(command_buffer_proxy);
-    context3d()->shallowFlushCHROMIUM();
-    command_buffer_proxy->SetLatencyInfo(latency_info);
-
-    if (reflector_.get())
-      reflector_->OnPostSubBuffer(rect);
-
-    OutputSurface::PostSubBuffer(rect, latency_info);
+    OutputSurface::SwapBuffers(frame);
   }
 
   void SetReflector(ReflectorImpl* reflector) {
     reflector_ = reflector;
   }
 
  private:
   int surface_id_;
   scoped_refptr<BrowserCompositorOutputSurfaceProxy> output_surface_proxy_;
 
@@ skipping 475 matching lines @@
   delete g_factory;
   g_factory = NULL;
 }
 
 // static
 ImageTransportFactory* ImageTransportFactory::GetInstance() {
   return g_factory;
 }
 
 }  // namespace content