Index: content/browser/android/synchronous_compositor_host.cc |
diff --git a/content/browser/android/synchronous_compositor_host.cc b/content/browser/android/synchronous_compositor_host.cc |
index 181a5addd12905ca1d1694d09713775df847a5cf..f63373c5dd72ef1d7806b5850335a9bd234f166a 100644 |
--- a/content/browser/android/synchronous_compositor_host.cc |
+++ b/content/browser/android/synchronous_compositor_host.cc |
@@ -88,8 +88,8 @@ SynchronousCompositorHost::~SynchronousCompositorHost() { |
bool SynchronousCompositorHost::OnMessageReceived(const IPC::Message& message) { |
bool handled = true; |
IPC_BEGIN_MESSAGE_MAP(SynchronousCompositorHost, message) |
- IPC_MESSAGE_HANDLER(SyncCompositorHostMsg_OutputSurfaceCreated, |
- OutputSurfaceCreated) |
+ IPC_MESSAGE_HANDLER(SyncCompositorHostMsg_CompositorFrameSinkCreated, |
+ CompositorFrameSinkCreated) |
IPC_MESSAGE_HANDLER(SyncCompositorHostMsg_UpdateState, ProcessCommonParams) |
IPC_MESSAGE_HANDLER_GENERIC(SyncCompositorHostMsg_ReturnFrame, |
DemandDrawHwReceiveFrame(message)) |
@@ -115,19 +115,20 @@ SynchronousCompositor::Frame SynchronousCompositorHost::DemandDrawHw( |
SyncCompositorDemandDrawHwParams params(viewport_size, |
viewport_rect_for_tile_priority, |
transform_for_tile_priority); |
- uint32_t output_surface_id; |
+ uint32_t compositor_frame_sink_id; |
cc::CompositorFrame compositor_frame; |
SyncCompositorCommonRendererParams common_renderer_params; |
if (!sender_->Send(new SyncCompositorMsg_DemandDrawHw( |
- routing_id_, params, &common_renderer_params, &output_surface_id, |
- &compositor_frame))) { |
+ routing_id_, params, &common_renderer_params, |
+ &compositor_frame_sink_id, &compositor_frame))) { |
return SynchronousCompositor::Frame(); |
} |
ProcessCommonParams(common_renderer_params); |
- return ProcessHardwareFrame(output_surface_id, std::move(compositor_frame)); |
+ return ProcessHardwareFrame(compositor_frame_sink_id, |
+ std::move(compositor_frame)); |
} |
bool SynchronousCompositorHost::DemandDrawHwReceiveFrame( |
@@ -135,19 +136,19 @@ bool SynchronousCompositorHost::DemandDrawHwReceiveFrame( |
SyncCompositorHostMsg_ReturnFrame::Param param; |
if (!SyncCompositorHostMsg_ReturnFrame::Read(&message, ¶m)) |
return false; |
- uint32_t output_surface_id = std::get<0>(param); |
+ uint32_t compositor_frame_sink_id = std::get<0>(param); |
cc::CompositorFrame compositor_frame = std::move(std::get<1>(param)); |
- client_->OnDrawHardwareProcessFrame( |
- ProcessHardwareFrame(output_surface_id, std::move(compositor_frame))); |
+ client_->OnDrawHardwareProcessFrame(ProcessHardwareFrame( |
+ compositor_frame_sink_id, std::move(compositor_frame))); |
return true; |
} |
SynchronousCompositor::Frame SynchronousCompositorHost::ProcessHardwareFrame( |
- uint32_t output_surface_id, |
+ uint32_t compositor_frame_sink_id, |
cc::CompositorFrame compositor_frame) { |
SynchronousCompositor::Frame frame; |
frame.frame.reset(new cc::CompositorFrame); |
- frame.output_surface_id = output_surface_id; |
+ frame.compositor_frame_sink_id = compositor_frame_sink_id; |
*frame.frame = std::move(compositor_frame); |
if (!frame.frame->delegated_frame_data) { |
// This can happen if compositor did not swap in this draw. |
@@ -320,11 +321,11 @@ void SynchronousCompositorHost::SendZeroMemory() { |
} |
void SynchronousCompositorHost::ReturnResources( |
- uint32_t output_surface_id, |
+ uint32_t compositor_frame_sink_id, |
const cc::ReturnedResourceArray& resources) { |
DCHECK(!resources.empty()); |
sender_->Send(new SyncCompositorMsg_ReclaimResources( |
- routing_id_, output_surface_id, resources)); |
+ routing_id_, compositor_frame_sink_id, resources)); |
} |
void SynchronousCompositorHost::SetMemoryPolicy(size_t bytes_limit) { |
@@ -379,8 +380,8 @@ void SynchronousCompositorHost::DidSendBeginFrame( |
rph_observer_->SyncStateAfterVSync(window_android, this); |
} |
-void SynchronousCompositorHost::OutputSurfaceCreated() { |
- // New output surface is not aware of state from Browser side. So need to |
+void SynchronousCompositorHost::CompositorFrameSinkCreated() { |
+ // New CompositorFrameSink is not aware of state from Browser side. So need to |
// re-send all browser side state here. |
sender_->Send( |
new SyncCompositorMsg_SetMemoryPolicy(routing_id_, bytes_limit_)); |