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 "services/ui/public/cpp/window_compositor_frame_sink.h" | 5 #include "services/ui/public/cpp/window_compositor_frame_sink.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_sink_client.h" | 9 #include "cc/output/compositor_frame_sink_client.h" |
10 #include "gpu/ipc/client/gpu_channel_host.h" | 10 #include "gpu/ipc/client/gpu_channel_host.h" |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
58 compositor_frame_sink_.reset(); | 58 compositor_frame_sink_.reset(); |
59 cc::CompositorFrameSink::DetachFromClient(); | 59 cc::CompositorFrameSink::DetachFromClient(); |
60 } | 60 } |
61 | 61 |
62 void WindowCompositorFrameSink::SubmitCompositorFrame( | 62 void WindowCompositorFrameSink::SubmitCompositorFrame( |
63 cc::CompositorFrame frame) { | 63 cc::CompositorFrame frame) { |
64 DCHECK(thread_checker_); | 64 DCHECK(thread_checker_); |
65 DCHECK(thread_checker_->CalledOnValidThread()); | 65 DCHECK(thread_checker_->CalledOnValidThread()); |
66 if (!compositor_frame_sink_) | 66 if (!compositor_frame_sink_) |
67 return; | 67 return; |
68 compositor_frame_sink_->SubmitCompositorFrame(std::move(frame)); | 68 |
| 69 gfx::Size frame_size = last_submitted_frame_size_; |
| 70 if (!frame.render_pass_list.empty()) |
| 71 frame_size = frame.render_pass_list[0]->output_rect.size(); |
| 72 if (!local_frame_id_.is_valid() || frame_size != last_submitted_frame_size_) |
| 73 local_frame_id_ = id_allocator_.GenerateId(); |
| 74 |
| 75 compositor_frame_sink_->SubmitCompositorFrame(local_frame_id_, |
| 76 std::move(frame)); |
| 77 |
| 78 last_submitted_frame_size_ = frame_size; |
69 } | 79 } |
70 | 80 |
71 WindowCompositorFrameSink::WindowCompositorFrameSink( | 81 WindowCompositorFrameSink::WindowCompositorFrameSink( |
72 scoped_refptr<cc::ContextProvider> context_provider, | 82 scoped_refptr<cc::ContextProvider> context_provider, |
73 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager, | 83 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager, |
74 mojo::InterfacePtrInfo<cc::mojom::MojoCompositorFrameSink> | 84 mojo::InterfacePtrInfo<cc::mojom::MojoCompositorFrameSink> |
75 compositor_frame_sink_info, | 85 compositor_frame_sink_info, |
76 cc::mojom::MojoCompositorFrameSinkClientRequest client_request) | 86 cc::mojom::MojoCompositorFrameSinkClientRequest client_request) |
77 : cc::CompositorFrameSink(std::move(context_provider), | 87 : cc::CompositorFrameSink(std::move(context_provider), |
78 nullptr, | 88 nullptr, |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
110 WindowCompositorFrameSinkBinding::~WindowCompositorFrameSinkBinding() {} | 120 WindowCompositorFrameSinkBinding::~WindowCompositorFrameSinkBinding() {} |
111 | 121 |
112 WindowCompositorFrameSinkBinding::WindowCompositorFrameSinkBinding( | 122 WindowCompositorFrameSinkBinding::WindowCompositorFrameSinkBinding( |
113 cc::mojom::MojoCompositorFrameSinkRequest compositor_frame_sink_request, | 123 cc::mojom::MojoCompositorFrameSinkRequest compositor_frame_sink_request, |
114 mojo::InterfacePtrInfo<cc::mojom::MojoCompositorFrameSinkClient> | 124 mojo::InterfacePtrInfo<cc::mojom::MojoCompositorFrameSinkClient> |
115 compositor_frame_sink_client) | 125 compositor_frame_sink_client) |
116 : compositor_frame_sink_request_(std::move(compositor_frame_sink_request)), | 126 : compositor_frame_sink_request_(std::move(compositor_frame_sink_request)), |
117 compositor_frame_sink_client_(std::move(compositor_frame_sink_client)) {} | 127 compositor_frame_sink_client_(std::move(compositor_frame_sink_client)) {} |
118 | 128 |
119 } // namespace ui | 129 } // namespace ui |
OLD | NEW |