| Index: cc/test/fake_output_surface.cc
|
| diff --git a/cc/test/fake_output_surface.cc b/cc/test/fake_output_surface.cc
|
| index 23b2eda51bef30402221bf57968a70a4e7f572f5..3408964ff5708586ee7c6dec89beda6a648f2a08 100644
|
| --- a/cc/test/fake_output_surface.cc
|
| +++ b/cc/test/fake_output_surface.cc
|
| @@ -38,13 +38,7 @@ FakeOutputSurface::FakeOutputSurface(
|
| bool delegated_rendering)
|
| : OutputSurface(std::move(context_provider),
|
| std::move(worker_context_provider),
|
| - std::move(software_device)),
|
| - client_(NULL),
|
| - num_sent_frames_(0),
|
| - has_external_stencil_test_(false),
|
| - suspended_for_recycle_(false),
|
| - framebuffer_(0),
|
| - overlay_candidate_validator_(nullptr) {
|
| + std::move(software_device)) {
|
| capabilities_.delegated_rendering = delegated_rendering;
|
| }
|
|
|
| @@ -72,11 +66,19 @@ void FakeOutputSurface::SwapBuffers(CompositorFrame* frame) {
|
| }
|
|
|
| void FakeOutputSurface::BindFramebuffer() {
|
| - if (framebuffer_)
|
| + if (framebuffer_) {
|
| context_provider_->ContextGL()->BindFramebuffer(GL_FRAMEBUFFER,
|
| framebuffer_);
|
| - else
|
| + } else {
|
| OutputSurface::BindFramebuffer();
|
| + }
|
| +}
|
| +
|
| +uint32_t FakeOutputSurface::GetFramebufferCopyTextureFormat() {
|
| + if (framebuffer_)
|
| + return framebuffer_format_;
|
| + else
|
| + return GL_RGB;
|
| }
|
|
|
| bool FakeOutputSurface::BindToClient(OutputSurfaceClient* client) {
|
|
|