sync compositor: Add output_surface_id

content/public/test/test_synchronous_compositor_android.cc

 // Copyright 2014 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/public/test/test_synchronous_compositor_android.h"
 
 #include <utility>
 
 #include "cc/output/compositor_frame.h"
 
 namespace content {
 
 TestSynchronousCompositor::TestSynchronousCompositor() : client_(NULL) {
 }
 
 TestSynchronousCompositor::~TestSynchronousCompositor() {
   SetClient(NULL);
 }
 
 void TestSynchronousCompositor::SetClient(SynchronousCompositorClient* client) {
   if (client_)
     client_->DidDestroyCompositor(this);
   client_ = client;
   if (client_) {
     client_->DidInitializeCompositor(this);
     client_->DidBecomeCurrent(this);
   }
 }
 
-scoped_ptr<cc::CompositorFrame> TestSynchronousCompositor::DemandDrawHw(
+SynchronousCompositor::Frame TestSynchronousCompositor::DemandDrawHw(
     const gfx::Size& surface_size,
     const gfx::Transform& transform,
     const gfx::Rect& viewport,
     const gfx::Rect& clip,
     const gfx::Rect& viewport_rect_for_tile_priority,
     const gfx::Transform& transform_for_tile_priority) {
   return std::move(hardware_frame_);
 }
 
+void TestSynchronousCompositor::ReturnResources(
+    uint32_t output_surface_id,
+    const cc::CompositorFrameAck& frame_ack) {
+  ReturnedResources returned_resources;
+  returned_resources.output_surface_id = output_surface_id;
+  returned_resources.resources = frame_ack.resources;
+  frame_ack_array_.push_back(returned_resources);
+}
+
+void TestSynchronousCompositor::SwapReturnedResources(FrameAckArray* array) {
+  DCHECK(array);
+  frame_ack_array_.swap(*array);
+}
+
 bool TestSynchronousCompositor::DemandDrawSw(SkCanvas* canvas) {
   DCHECK(canvas);
   return true;
 }
 
 void TestSynchronousCompositor::SetHardwareFrame(
+    uint32_t output_surface_id,
     scoped_ptr<cc::CompositorFrame> frame) {
-  hardware_frame_ = std::move(frame);
+  hardware_frame_.output_surface_id = output_surface_id;
+  hardware_frame_.frame = std::move(frame);
 }
 
+TestSynchronousCompositor::ReturnedResources::ReturnedResources()
+    : output_surface_id(0u) {}
+
+TestSynchronousCompositor::ReturnedResources::~ReturnedResources() {}
+
 }  // namespace content