OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "cc/surfaces/surface_display_output_surface.h" | 5 #include "cc/surfaces/surface_display_output_surface.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "cc/output/compositor_frame.h" | 8 #include "cc/output/compositor_frame.h" |
9 #include "cc/output/compositor_frame_ack.h" | 9 #include "cc/output/compositor_frame_ack.h" |
10 #include "cc/surfaces/display.h" | 10 #include "cc/surfaces/display.h" |
11 #include "cc/surfaces/onscreen_display_client.h" | 11 #include "cc/surfaces/onscreen_display_client.h" |
12 #include "cc/surfaces/surface.h" | 12 #include "cc/surfaces/surface.h" |
13 #include "cc/surfaces/surface_manager.h" | 13 #include "cc/surfaces/surface_manager.h" |
14 | 14 |
15 namespace cc { | 15 namespace cc { |
16 | 16 |
17 SurfaceDisplayOutputSurface::SurfaceDisplayOutputSurface( | 17 SurfaceDisplayOutputSurface::SurfaceDisplayOutputSurface( |
18 SurfaceManager* surface_manager, | 18 SurfaceManager* surface_manager, |
19 SurfaceIdAllocator* allocator, | 19 SurfaceIdAllocator* allocator, |
20 const scoped_refptr<ContextProvider>& context_provider, | 20 scoped_refptr<ContextProvider> context_provider, |
21 const scoped_refptr<ContextProvider>& worker_context_provider) | 21 scoped_refptr<ContextProvider> worker_context_provider) |
22 : OutputSurface(context_provider, worker_context_provider), | 22 : OutputSurface(std::move(context_provider), |
| 23 std::move(worker_context_provider)), |
23 display_client_(NULL), | 24 display_client_(NULL), |
24 factory_(surface_manager, this), | 25 factory_(surface_manager, this), |
25 allocator_(allocator) { | 26 allocator_(allocator) { |
26 factory_.set_needs_sync_points(false); | 27 factory_.set_needs_sync_points(false); |
27 capabilities_.delegated_rendering = true; | 28 capabilities_.delegated_rendering = true; |
28 capabilities_.adjust_deadline_for_parent = true; | 29 capabilities_.adjust_deadline_for_parent = true; |
29 capabilities_.can_force_reclaim_resources = true; | 30 capabilities_.can_force_reclaim_resources = true; |
30 // Display and SurfaceDisplayOutputSurface share a GL context, so sync | 31 // Display and SurfaceDisplayOutputSurface share a GL context, so sync |
31 // points aren't needed when passing resources between them. | 32 // points aren't needed when passing resources between them. |
32 capabilities_.delegated_sync_points_required = false; | 33 capabilities_.delegated_sync_points_required = false; |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
110 BeginFrameSource* begin_frame_source) { | 111 BeginFrameSource* begin_frame_source) { |
111 // TODO(tansell): Hook this up. | 112 // TODO(tansell): Hook this up. |
112 } | 113 } |
113 | 114 |
114 void SurfaceDisplayOutputSurface::SwapBuffersComplete(SurfaceDrawStatus drawn) { | 115 void SurfaceDisplayOutputSurface::SwapBuffersComplete(SurfaceDrawStatus drawn) { |
115 if (client_ && !display_client_->output_surface_lost()) | 116 if (client_ && !display_client_->output_surface_lost()) |
116 client_->DidSwapBuffersComplete(); | 117 client_->DidSwapBuffersComplete(); |
117 } | 118 } |
118 | 119 |
119 } // namespace cc | 120 } // namespace cc |
OLD | NEW |