Index: cc/surfaces/surface_display_output_surface.cc |
diff --git a/cc/surfaces/surface_display_output_surface.cc b/cc/surfaces/surface_display_output_surface.cc |
deleted file mode 100644 |
index 04937247d71a01d9f05047802c0dc5341d86143b..0000000000000000000000000000000000000000 |
--- a/cc/surfaces/surface_display_output_surface.cc |
+++ /dev/null |
@@ -1,100 +0,0 @@ |
-// 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 "cc/surfaces/surface_display_output_surface.h" |
- |
-#include "base/bind.h" |
-#include "cc/output/compositor_frame.h" |
-#include "cc/output/compositor_frame_ack.h" |
-#include "cc/surfaces/display.h" |
-#include "cc/surfaces/onscreen_display_client.h" |
-#include "cc/surfaces/surface.h" |
-#include "cc/surfaces/surface_manager.h" |
- |
-namespace cc { |
- |
-SurfaceDisplayOutputSurface::SurfaceDisplayOutputSurface( |
- SurfaceManager* surface_manager, |
- SurfaceIdAllocator* allocator, |
- const scoped_refptr<ContextProvider>& context_provider) |
- : OutputSurface(context_provider), |
- display_client_(NULL), |
- surface_manager_(surface_manager), |
- factory_(surface_manager, this), |
- allocator_(allocator) { |
- capabilities_.delegated_rendering = true; |
- capabilities_.max_frames_pending = 1; |
- capabilities_.adjust_deadline_for_parent = true; |
- capabilities_.can_force_reclaim_resources = true; |
-} |
- |
-SurfaceDisplayOutputSurface::~SurfaceDisplayOutputSurface() { |
- client_ = NULL; |
- if (!surface_id_.is_null()) { |
- factory_.Destroy(surface_id_); |
- } |
-} |
- |
-void SurfaceDisplayOutputSurface::ReceivedVSyncParameters( |
- base::TimeTicks timebase, |
- base::TimeDelta interval) { |
- CommitVSyncParameters(timebase, interval); |
-} |
- |
-void SurfaceDisplayOutputSurface::SwapBuffers(CompositorFrame* frame) { |
- gfx::Size frame_size = |
- frame->delegated_frame_data->render_pass_list.back()->output_rect.size(); |
- if (frame_size.IsEmpty() || frame_size != display_size_) { |
- if (!surface_id_.is_null()) { |
- factory_.Destroy(surface_id_); |
- } |
- surface_id_ = allocator_->GenerateId(); |
- factory_.Create(surface_id_); |
- display_size_ = frame_size; |
- } |
- display_client_->display()->SetSurfaceId(surface_id_, |
- frame->metadata.device_scale_factor); |
- |
- scoped_ptr<CompositorFrame> frame_copy(new CompositorFrame()); |
- frame->AssignTo(frame_copy.get()); |
- factory_.SubmitFrame( |
- surface_id_, frame_copy.Pass(), |
- base::Bind(&SurfaceDisplayOutputSurface::SwapBuffersComplete, |
- base::Unretained(this))); |
- |
- client_->DidSwapBuffers(); |
-} |
- |
-bool SurfaceDisplayOutputSurface::BindToClient(OutputSurfaceClient* client) { |
- DCHECK(client); |
- DCHECK(display_client_); |
- client_ = client; |
- // Avoid initializing GL context here, as this should be sharing the |
- // Display's context. |
- return display_client_->Initialize(); |
-} |
- |
-void SurfaceDisplayOutputSurface::ForceReclaimResources() { |
- if (!surface_id_.is_null()) { |
- scoped_ptr<CompositorFrame> empty_frame(new CompositorFrame()); |
- empty_frame->delegated_frame_data.reset(new DelegatedFrameData); |
- factory_.SubmitFrame(surface_id_, empty_frame.Pass(), |
- SurfaceFactory::DrawCallback()); |
- } |
-} |
- |
-void SurfaceDisplayOutputSurface::ReturnResources( |
- const ReturnedResourceArray& resources) { |
- CompositorFrameAck ack; |
- ack.resources = resources; |
- if (client_) |
- client_->ReclaimResources(&ack); |
-} |
- |
-void SurfaceDisplayOutputSurface::SwapBuffersComplete(SurfaceDrawStatus drawn) { |
- if (client_ && !display_client_->output_surface_lost()) |
- client_->DidSwapBuffersComplete(); |
-} |
- |
-} // namespace cc |