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

Unified Diff: content/browser/renderer_host/render_widget_host_view_android.cc

Issue 2728183002: RendererCompositorFrameSink should handle local surface id allocation (Closed)
Patch Set: rebase Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
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..50991ff13baebcab98c324359eff002711dd5999 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,
+ const cc::LocalSurfaceId& local_surface_id,
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,
+ const cc::LocalSurfaceId& local_surface_id,
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() {

Powered by Google App Engine
This is Rietveld 408576698