Unified OutputSurface::SwapBuffers.

cc/output/delegating_renderer.cc

 // Copyright 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 "cc/output/delegating_renderer.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 35 matching lines @@
       output_surface_(output_surface),
       resource_provider_(resource_provider),
       visible_(true) {
   DCHECK(resource_provider_);
 }
 
 bool DelegatingRenderer::Initialize() {
   capabilities_.using_partial_swap = false;
   // TODO(danakj): Throttling - we may want to only allow 1 outstanding frame,
   // but the parent compositor may pipeline for us.
-  // TODO(danakj): Can we use this in single-thread mode?
-  capabilities_.using_swap_complete_callback = true;
   capabilities_.max_texture_size = resource_provider_->max_texture_size();
   capabilities_.best_texture_format = resource_provider_->best_texture_format();
   capabilities_.allow_partial_texture_updates = false;
   capabilities_.using_offscreen_context3d = false;
 
   WebGraphicsContext3D* context3d = resource_provider_->GraphicsContext3D();
 
   if (!context3d) {
     // Software compositing.
     return true;
@@ skipping 81 matching lines @@
   DrawQuad::ResourceIteratorCallback append_to_array =
       base::Bind(&AppendToArray, &resources);
   for (size_t i = 0; i < out_data.render_pass_list.size(); ++i) {
     RenderPass* render_pass = out_data.render_pass_list.at(i);
     for (size_t j = 0; j < render_pass->quad_list.size(); ++j)
       render_pass->quad_list[j]->IterateResources(append_to_array);
   }
   resource_provider_->PrepareSendToParent(resources, &out_data.resource_list);
 }
 
-void DelegatingRenderer::SwapBuffers(const ui::LatencyInfo& latency_info) {
+void DelegatingRenderer::SwapBuffers() {
   TRACE_EVENT0("cc", "DelegatingRenderer::SwapBuffers");
 
-  output_surface_->SendFrameToParentCompositor(&frame_for_swap_buffers_);
+  output_surface_->SwapBuffers(&frame_for_swap_buffers_);
   frame_for_swap_buffers_.delegated_frame_data.reset();
 }
 
 void DelegatingRenderer::GetFramebufferPixels(void* pixels, gfx::Rect rect) {
   NOTREACHED();
 }
 
-void DelegatingRenderer::ReceiveCompositorFrameAck(
+void DelegatingRenderer::ReceiveSwapBuffersAck(
     const CompositorFrameAck& ack) {
   resource_provider_->ReceiveFromParent(ack.resources);
 }
 
 
 bool DelegatingRenderer::IsContextLost() {
   WebGraphicsContext3D* context3d = resource_provider_->GraphicsContext3D();
   if (!context3d)
     return false;
   return context3d->getGraphicsResetStatusARB() != GL_NO_ERROR;
 }
 
 void DelegatingRenderer::SetVisible(bool visible) {
   visible_ = visible;
 }
 
 }  // namespace cc