Chromium Code Reviews| Index: content/browser/renderer_host/render_widget_host_view_android.cc |
| diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc |
| index 0404809aee851394babc0f21a464ff167e212e2f..131768201b8e8b9dc7f9ff5b00ea0ca76d8f1c18 100644 |
| --- a/content/browser/renderer_host/render_widget_host_view_android.cc |
| +++ b/content/browser/renderer_host/render_widget_host_view_android.cc |
| @@ -1142,6 +1142,7 @@ void RenderWidgetHostViewAndroid::CheckCompositorFrameSinkChanged( |
| void RenderWidgetHostViewAndroid::InternalSwapCompositorFrame( |
| uint32_t compositor_frame_sink_id, |
| + cc::LocalSurfaceId local_surface_id, |
|
Fady Samuel
2017/03/15 12:05:48
const cc::LocalSurfaceId&
Saman Sami
2017/03/16 18:33:07
Done.
|
| cc::CompositorFrame frame) { |
| last_scroll_offset_ = frame.metadata.root_scroll_offset; |
| DCHECK(delegated_frame_host_); |
| @@ -1166,7 +1167,8 @@ void RenderWidgetHostViewAndroid::InternalSwapCompositorFrame( |
| if (!has_content) { |
| DestroyDelegatedContent(); |
| } else { |
| - delegated_frame_host_->SubmitCompositorFrame(std::move(frame)); |
| + delegated_frame_host_->SubmitCompositorFrame(local_surface_id, |
| + std::move(frame)); |
| frame_evictor_->SwappedFrame(!host_->is_hidden()); |
| } |
| @@ -1195,8 +1197,10 @@ void RenderWidgetHostViewAndroid::DestroyDelegatedContent() { |
| void RenderWidgetHostViewAndroid::OnSwapCompositorFrame( |
| uint32_t compositor_frame_sink_id, |
| + cc::LocalSurfaceId local_surface_id, |
|
Fady Samuel
2017/03/15 12:05:48
const cc::LocalSurfaceId&
Saman Sami
2017/03/16 18:33:07
Done.
|
| cc::CompositorFrame frame) { |
| - InternalSwapCompositorFrame(compositor_frame_sink_id, std::move(frame)); |
| + InternalSwapCompositorFrame(compositor_frame_sink_id, local_surface_id, |
| + std::move(frame)); |
| } |
| void RenderWidgetHostViewAndroid::ClearCompositorFrame() { |