| Index: cc/output/output_surface.cc
|
| diff --git a/cc/output/output_surface.cc b/cc/output/output_surface.cc
|
| index f0cbf5da205503f7244be7dad95744850d4392f7..68b2294c3eb3c4084149feef1fa176f79138c465 100644
|
| --- a/cc/output/output_surface.cc
|
| +++ b/cc/output/output_surface.cc
|
| @@ -16,8 +16,6 @@
|
| #include "base/metrics/histogram.h"
|
| #include "base/strings/string_split.h"
|
| #include "base/strings/string_util.h"
|
| -#include "cc/output/compositor_frame.h"
|
| -#include "cc/output/compositor_frame_ack.h"
|
| #include "cc/output/managed_memory_policy.h"
|
| #include "cc/output/output_surface_client.h"
|
| #include "cc/scheduler/delay_based_time_source.h"
|
| @@ -222,35 +220,6 @@ void OutputSurface::BindFramebuffer() {
|
| context_provider_->ContextGL()->BindFramebuffer(GL_FRAMEBUFFER, 0);
|
| }
|
|
|
| -void OutputSurface::SwapBuffers(CompositorFrame* frame) {
|
| - // TODO(sievers): Make OutputSurface::SwapBuffers() pure virtual.
|
| - // The implementation here is used for tests only.
|
| - if (frame->software_frame_data) {
|
| - PostSwapBuffersComplete();
|
| - client_->DidSwapBuffers();
|
| - return;
|
| - }
|
| -
|
| - DCHECK(context_provider_.get());
|
| - DCHECK(frame->gl_frame_data);
|
| -
|
| - if (frame->gl_frame_data->sub_buffer_rect ==
|
| - gfx::Rect(frame->gl_frame_data->size)) {
|
| - context_provider_->ContextSupport()->Swap();
|
| - } else {
|
| - context_provider_->ContextSupport()->PartialSwapBuffers(
|
| - frame->gl_frame_data->sub_buffer_rect);
|
| - }
|
| - uint32_t sync_point =
|
| - context_provider_->ContextGL()->InsertSyncPointCHROMIUM();
|
| - context_provider_->ContextSupport()->SignalSyncPoint(
|
| - sync_point,
|
| - base::Bind(&OutputSurface::OnSwapBuffersComplete,
|
| - weak_ptr_factory_.GetWeakPtr()));
|
| -
|
| - client_->DidSwapBuffers();
|
| -}
|
| -
|
| void OutputSurface::PostSwapBuffersComplete() {
|
| base::MessageLoop::current()->PostTask(
|
| FROM_HERE,
|
|
|