Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(270)

Side by Side Diff: content/renderer/gpu/compositor_output_surface.cc

Issue 2144733005: [WIP] cc: Plumb SurfaceId from clients Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Ensure only SurfaceFactoy and tests can update hierarchy Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/renderer/gpu/compositor_output_surface.h" 5 #include "content/renderer/gpu/compositor_output_surface.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/location.h" 10 #include "base/location.h"
11 #include "base/single_thread_task_runner.h" 11 #include "base/single_thread_task_runner.h"
12 #include "base/threading/thread_task_runner_handle.h" 12 #include "base/threading/thread_task_runner_handle.h"
13 #include "build/build_config.h" 13 #include "build/build_config.h"
14 #include "cc/output/compositor_frame.h" 14 #include "cc/output/compositor_frame.h"
15 #include "cc/output/managed_memory_policy.h" 15 #include "cc/output/managed_memory_policy.h"
16 #include "cc/output/output_surface_client.h" 16 #include "cc/output/output_surface_client.h"
17 #include "content/common/gpu/client/context_provider_command_buffer.h" 17 #include "content/common/gpu/client/context_provider_command_buffer.h"
18 #include "content/common/view_messages.h" 18 #include "content/common/view_messages.h"
19 #include "content/public/common/content_switches.h" 19 #include "content/public/common/content_switches.h"
20 #include "content/renderer/gpu/frame_swap_message_queue.h" 20 #include "content/renderer/gpu/frame_swap_message_queue.h"
21 #include "content/renderer/render_thread_impl.h" 21 #include "content/renderer/render_thread_impl.h"
22 #include "gpu/command_buffer/client/context_support.h" 22 #include "gpu/command_buffer/client/context_support.h"
23 #include "gpu/command_buffer/client/gles2_interface.h" 23 #include "gpu/command_buffer/client/gles2_interface.h"
24 #include "gpu/ipc/client/command_buffer_proxy_impl.h" 24 #include "gpu/ipc/client/command_buffer_proxy_impl.h"
25 #include "ipc/ipc_sync_channel.h" 25 #include "ipc/ipc_sync_channel.h"
26 #include "ui/gfx/geometry/dip_util.h"
26 27
27 namespace content { 28 namespace content {
28 29
29 CompositorOutputSurface::CompositorOutputSurface( 30 CompositorOutputSurface::CompositorOutputSurface(
30 int32_t routing_id, 31 int32_t routing_id,
31 uint32_t output_surface_id, 32 uint32_t output_surface_id,
32 scoped_refptr<cc::ContextProvider> context_provider, 33 scoped_refptr<cc::ContextProvider> context_provider,
33 scoped_refptr<cc::ContextProvider> worker_context_provider, 34 scoped_refptr<cc::ContextProvider> worker_context_provider,
34 scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue) 35 scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue)
35 : OutputSurface(std::move(context_provider), 36 : OutputSurface(std::move(context_provider),
36 std::move(worker_context_provider), 37 std::move(worker_context_provider),
37 nullptr), 38 nullptr),
38 output_surface_id_(output_surface_id), 39 output_surface_id_(output_surface_id),
39 output_surface_filter_( 40 output_surface_filter_(
40 RenderThreadImpl::current()->compositor_message_filter()), 41 RenderThreadImpl::current()->compositor_message_filter()),
41 message_sender_(RenderThreadImpl::current()->sync_message_filter()), 42 message_sender_(RenderThreadImpl::current()->sync_message_filter()),
42 frame_swap_message_queue_(swap_frame_message_queue), 43 frame_swap_message_queue_(swap_frame_message_queue),
44 allocator_(0),
45 current_scale_factor_(1.f),
43 routing_id_(routing_id) { 46 routing_id_(routing_id) {
44 DCHECK(output_surface_filter_); 47 DCHECK(output_surface_filter_);
45 DCHECK(frame_swap_message_queue_); 48 DCHECK(frame_swap_message_queue_);
46 DCHECK(message_sender_); 49 DCHECK(message_sender_);
47 capabilities_.delegated_rendering = true; 50 capabilities_.delegated_rendering = true;
48 } 51 }
49 52
50 CompositorOutputSurface::CompositorOutputSurface( 53 CompositorOutputSurface::CompositorOutputSurface(
51 int32_t routing_id, 54 int32_t routing_id,
52 uint32_t output_surface_id, 55 uint32_t output_surface_id,
53 scoped_refptr<cc::VulkanContextProvider> vulkan_context_provider, 56 scoped_refptr<cc::VulkanContextProvider> vulkan_context_provider,
54 scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue) 57 scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue)
55 : OutputSurface(std::move(vulkan_context_provider)), 58 : OutputSurface(std::move(vulkan_context_provider)),
56 output_surface_id_(output_surface_id), 59 output_surface_id_(output_surface_id),
57 output_surface_filter_( 60 output_surface_filter_(
58 RenderThreadImpl::current()->compositor_message_filter()), 61 RenderThreadImpl::current()->compositor_message_filter()),
59 message_sender_(RenderThreadImpl::current()->sync_message_filter()), 62 message_sender_(RenderThreadImpl::current()->sync_message_filter()),
60 frame_swap_message_queue_(swap_frame_message_queue), 63 frame_swap_message_queue_(swap_frame_message_queue),
64 allocator_(0),
65 current_scale_factor_(1.f),
61 routing_id_(routing_id) { 66 routing_id_(routing_id) {
62 DCHECK(output_surface_filter_); 67 DCHECK(output_surface_filter_);
63 DCHECK(frame_swap_message_queue_); 68 DCHECK(frame_swap_message_queue_);
64 DCHECK(message_sender_); 69 DCHECK(message_sender_);
65 capabilities_.delegated_rendering = true; 70 capabilities_.delegated_rendering = true;
66 } 71 }
67 72
68 CompositorOutputSurface::~CompositorOutputSurface() = default; 73 CompositorOutputSurface::~CompositorOutputSurface() = default;
69 74
70 bool CompositorOutputSurface::BindToClient( 75 bool CompositorOutputSurface::BindToClient(
(...skipping 25 matching lines...) Expand all
96 return; 101 return;
97 if (output_surface_proxy_) { 102 if (output_surface_proxy_) {
98 output_surface_proxy_->ClearOutputSurface(); 103 output_surface_proxy_->ClearOutputSurface();
99 output_surface_filter_->RemoveHandlerOnCompositorThread( 104 output_surface_filter_->RemoveHandlerOnCompositorThread(
100 routing_id_, output_surface_filter_handler_); 105 routing_id_, output_surface_filter_handler_);
101 } 106 }
102 cc::OutputSurface::DetachFromClient(); 107 cc::OutputSurface::DetachFromClient();
103 } 108 }
104 109
105 void CompositorOutputSurface::SwapBuffers(cc::CompositorFrame frame) { 110 void CompositorOutputSurface::SwapBuffers(cc::CompositorFrame frame) {
111 cc::RenderPass* root_pass =
112 frame.delegated_frame_data->render_pass_list.back().get();
113 float frame_device_scale_factor = frame.metadata.device_scale_factor;
114 gfx::Size frame_size = root_pass->output_rect.size();
115 gfx::Size frame_size_in_dip =
116 gfx::ConvertSizeToDIP(frame_device_scale_factor, frame_size);
117 if (surface_id_.is_null() || frame_size != current_surface_size_ ||
118 frame_size_in_dip != current_surface_size_in_dip_) {
119 surface_id_ = allocator_.GenerateId();
120 current_surface_size_ = frame_size;
121 current_surface_size_in_dip_ = frame_size_in_dip;
122 current_scale_factor_ = frame_device_scale_factor;
123 }
124
106 { 125 {
107 std::unique_ptr<FrameSwapMessageQueue::SendMessageScope> 126 std::unique_ptr<FrameSwapMessageQueue::SendMessageScope>
108 send_message_scope = 127 send_message_scope =
109 frame_swap_message_queue_->AcquireSendMessageScope(); 128 frame_swap_message_queue_->AcquireSendMessageScope();
110 std::vector<std::unique_ptr<IPC::Message>> messages; 129 std::vector<std::unique_ptr<IPC::Message>> messages;
111 std::vector<IPC::Message> messages_to_deliver_with_frame; 130 std::vector<IPC::Message> messages_to_deliver_with_frame;
112 frame_swap_message_queue_->DrainMessages(&messages); 131 frame_swap_message_queue_->DrainMessages(&messages);
113 FrameSwapMessageQueue::TransferMessages(&messages, 132 FrameSwapMessageQueue::TransferMessages(&messages,
114 &messages_to_deliver_with_frame); 133 &messages_to_deliver_with_frame);
115 Send(new ViewHostMsg_SwapCompositorFrame(routing_id_, output_surface_id_, 134 Send(new ViewHostMsg_SwapCompositorFrame(routing_id_, output_surface_id_,
116 frame, 135 surface_id_, frame,
117 messages_to_deliver_with_frame)); 136 messages_to_deliver_with_frame));
118 // ~send_message_scope. 137 // ~send_message_scope.
119 } 138 }
120 } 139 }
121 140
122 void CompositorOutputSurface::BindFramebuffer() { 141 void CompositorOutputSurface::BindFramebuffer() {
123 // This is a delegating output surface, no framebuffer/direct drawing support. 142 // This is a delegating output surface, no framebuffer/direct drawing support.
124 NOTREACHED(); 143 NOTREACHED();
125 } 144 }
126 145
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 ReclaimResources(resources); 183 ReclaimResources(resources);
165 if (is_swap_ack) 184 if (is_swap_ack)
166 client_->DidSwapBuffersComplete(); 185 client_->DidSwapBuffersComplete();
167 } 186 }
168 187
169 bool CompositorOutputSurface::Send(IPC::Message* message) { 188 bool CompositorOutputSurface::Send(IPC::Message* message) {
170 return message_sender_->Send(message); 189 return message_sender_->Send(message);
171 } 190 }
172 191
173 } // namespace content 192 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/gpu/compositor_output_surface.h ('k') | content/renderer/gpu/render_widget_compositor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698