| Index: cc/test/fake_output_surface.cc
|
| diff --git a/cc/test/fake_output_surface.cc b/cc/test/fake_output_surface.cc
|
| index f8a9b7cb6e0a40f83a2b2677ac338086bb92f54a..4860f647daeaf775c407c52304ecc59834d11340 100644
|
| --- a/cc/test/fake_output_surface.cc
|
| +++ b/cc/test/fake_output_surface.cc
|
| @@ -6,7 +6,6 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/message_loop/message_loop.h"
|
| -#include "cc/output/compositor_frame_ack.h"
|
| #include "cc/output/output_surface_client.h"
|
| #include "cc/resources/returned_resource.h"
|
| #include "cc/test/begin_frame_args_test.h"
|
| @@ -102,7 +101,8 @@ void FakeOutputSurface::SetTreeActivationCallback(
|
| client_->SetTreeActivationCallback(callback);
|
| }
|
|
|
| -void FakeOutputSurface::ReturnResource(unsigned id, CompositorFrameAck* ack) {
|
| +void FakeOutputSurface::ReturnResource(unsigned id,
|
| + ReturnedResourceArray* resources) {
|
| TransferableResourceArray::iterator it;
|
| for (it = resources_held_by_parent_.begin();
|
| it != resources_held_by_parent_.end();
|
| @@ -111,7 +111,7 @@ void FakeOutputSurface::ReturnResource(unsigned id, CompositorFrameAck* ack) {
|
| break;
|
| }
|
| DCHECK(it != resources_held_by_parent_.end());
|
| - ack->resources.push_back(it->ToReturnedResource());
|
| + resources->push_back(it->ToReturnedResource());
|
| resources_held_by_parent_.erase(it);
|
| }
|
|
|
|
|