| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "content/browser/compositor/mus_browser_compositor_output_surface.h" | 5 #include "content/browser/compositor/mus_browser_compositor_output_surface.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "cc/output/compositor_frame.h" | 9 #include "cc/output/compositor_frame.h" |
| 10 #include "cc/output/output_surface_frame.h" | 10 #include "cc/output/output_surface_frame.h" |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 const UpdateVSyncParametersCallback& update_vsync_parameters_callback, | 30 const UpdateVSyncParametersCallback& update_vsync_parameters_callback, |
| 31 std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator> | 31 std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator> |
| 32 overlay_candidate_validator) | 32 overlay_candidate_validator) |
| 33 : GpuBrowserCompositorOutputSurface(std::move(context), | 33 : GpuBrowserCompositorOutputSurface(std::move(context), |
| 34 update_vsync_parameters_callback, | 34 update_vsync_parameters_callback, |
| 35 std::move(overlay_candidate_validator)), | 35 std::move(overlay_candidate_validator)), |
| 36 ui_window_(window), | 36 ui_window_(window), |
| 37 window_(nullptr), | 37 window_(nullptr), |
| 38 begin_frame_source_(nullptr) { | 38 begin_frame_source_(nullptr) { |
| 39 ui_compositor_frame_sink_ = ui_window_->RequestCompositorFrameSink( | 39 ui_compositor_frame_sink_ = ui_window_->RequestCompositorFrameSink( |
| 40 ui::mojom::CompositorFrameSinkType::DEFAULT, context, | 40 context, gpu_memory_buffer_manager); |
| 41 gpu_memory_buffer_manager); | |
| 42 ui_compositor_frame_sink_->BindToClient(this); | 41 ui_compositor_frame_sink_->BindToClient(this); |
| 43 } | 42 } |
| 44 | 43 |
| 45 MusBrowserCompositorOutputSurface::MusBrowserCompositorOutputSurface( | 44 MusBrowserCompositorOutputSurface::MusBrowserCompositorOutputSurface( |
| 46 aura::Window* window, | 45 aura::Window* window, |
| 47 scoped_refptr<ui::ContextProviderCommandBuffer> context, | 46 scoped_refptr<ui::ContextProviderCommandBuffer> context, |
| 48 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager, | 47 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager, |
| 49 const UpdateVSyncParametersCallback& update_vsync_parameters_callback, | 48 const UpdateVSyncParametersCallback& update_vsync_parameters_callback, |
| 50 std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator> | 49 std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator> |
| 51 overlay_candidate_validator) | 50 overlay_candidate_validator) |
| 52 : GpuBrowserCompositorOutputSurface(std::move(context), | 51 : GpuBrowserCompositorOutputSurface(std::move(context), |
| 53 update_vsync_parameters_callback, | 52 update_vsync_parameters_callback, |
| 54 std::move(overlay_candidate_validator)), | 53 std::move(overlay_candidate_validator)), |
| 55 ui_window_(nullptr), | 54 ui_window_(nullptr), |
| 56 window_(window), | 55 window_(window), |
| 57 begin_frame_source_(nullptr) { | 56 begin_frame_source_(nullptr) { |
| 58 aura::WindowPortMus* window_port = aura::WindowPortMus::Get(window_); | 57 aura::WindowPortMus* window_port = aura::WindowPortMus::Get(window_); |
| 59 DCHECK(window_port); | 58 DCHECK(window_port); |
| 60 compositor_frame_sink_ = window_port->RequestCompositorFrameSink( | 59 compositor_frame_sink_ = window_port->RequestCompositorFrameSink( |
| 61 ui::mojom::CompositorFrameSinkType::DEFAULT, context, | 60 context, gpu_memory_buffer_manager); |
| 62 gpu_memory_buffer_manager); | |
| 63 compositor_frame_sink_->BindToClient(this); | 61 compositor_frame_sink_->BindToClient(this); |
| 64 } | 62 } |
| 65 | 63 |
| 66 MusBrowserCompositorOutputSurface::~MusBrowserCompositorOutputSurface() {} | 64 MusBrowserCompositorOutputSurface::~MusBrowserCompositorOutputSurface() {} |
| 67 | 65 |
| 68 cc::BeginFrameSource* MusBrowserCompositorOutputSurface::GetBeginFrameSource() { | 66 cc::BeginFrameSource* MusBrowserCompositorOutputSurface::GetBeginFrameSource() { |
| 69 return begin_frame_source_; | 67 return begin_frame_source_; |
| 70 } | 68 } |
| 71 | 69 |
| 72 void MusBrowserCompositorOutputSurface::SwapBuffers( | 70 void MusBrowserCompositorOutputSurface::SwapBuffers( |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 208 | 206 |
| 209 const gpu::Mailbox& MusBrowserCompositorOutputSurface::GetMailboxFromResourceId( | 207 const gpu::Mailbox& MusBrowserCompositorOutputSurface::GetMailboxFromResourceId( |
| 210 uint32_t id) { | 208 uint32_t id) { |
| 211 DCHECK_LT(id, mailboxes_.size()); | 209 DCHECK_LT(id, mailboxes_.size()); |
| 212 DCHECK(std::find(free_resource_ids_.begin(), free_resource_ids_.end(), id) == | 210 DCHECK(std::find(free_resource_ids_.begin(), free_resource_ids_.end(), id) == |
| 213 free_resource_ids_.end()); | 211 free_resource_ids_.end()); |
| 214 return mailboxes_[id]; | 212 return mailboxes_[id]; |
| 215 } | 213 } |
| 216 | 214 |
| 217 } // namespace content | 215 } // namespace content |
| OLD | NEW |