| Index: cc/test/test_delegating_output_surface.cc
|
| diff --git a/cc/test/test_delegating_output_surface.cc b/cc/test/test_delegating_output_surface.cc
|
| index 64a15fde20b2342dd5d5784f86ef0d09b8a96123..519bdad2f798f19d3088d76044e88bda7e4aea19 100644
|
| --- a/cc/test/test_delegating_output_surface.cc
|
| +++ b/cc/test/test_delegating_output_surface.cc
|
| @@ -8,6 +8,7 @@
|
| #include <utility>
|
|
|
| #include "cc/output/begin_frame_args.h"
|
| +#include "cc/output/copy_output_request.h"
|
| #include "cc/output/texture_mailbox_deleter.h"
|
| #include "cc/test/begin_frame_args_test.h"
|
|
|
| @@ -57,7 +58,14 @@ TestDelegatingOutputSurface::TestDelegatingOutputSurface(
|
| !context_shared_with_compositor;
|
| }
|
|
|
| -TestDelegatingOutputSurface::~TestDelegatingOutputSurface() {}
|
| +TestDelegatingOutputSurface::~TestDelegatingOutputSurface() {
|
| + DCHECK(copy_requests_.empty());
|
| +}
|
| +
|
| +void TestDelegatingOutputSurface::RequestCopyOfOutput(
|
| + std::unique_ptr<CopyOutputRequest> request) {
|
| + copy_requests_.push_back(std::move(request));
|
| +}
|
|
|
| bool TestDelegatingOutputSurface::BindToClient(OutputSurfaceClient* client) {
|
| if (!OutputSurface::BindToClient(client))
|
| @@ -115,6 +123,11 @@ void TestDelegatingOutputSurface::SwapBuffers(CompositorFrame frame) {
|
| base::Bind(&TestDelegatingOutputSurface::DrawCallback,
|
| weak_ptrs_.GetWeakPtr()));
|
|
|
| + for (std::unique_ptr<CopyOutputRequest>& copy_request : copy_requests_)
|
| + surface_factory_->RequestCopyOfSurface(delegated_surface_id_,
|
| + std::move(copy_request));
|
| + copy_requests_.clear();
|
| +
|
| if (!display_->has_scheduler())
|
| display_->DrawAndSwap();
|
| }
|
|
|