Remove non-surface sync code.
This CL finishes most of the cleanup of non-surface sync code path in
src/content. It's no longer possible to disable surface sync so this is
dead code.
Most of this code was for Android which put extra information in
CompositorFrameMetadata. This information is sent to the browser through
RenderFrameMetadata now. Remove the unnecessary member variables and all
usage of them.
Also update tests that check LayerTreeHostImpl sets metadata correctly.
The existing tests checked the information contained in
CompositorFrameMetadata instead of RenderFrameMetadata. In particular
LayerTreeHostImplTest.RenderFrameMetadata is based heavily on the
existing LayerTreeHostImplTest.CompositorFrameMetadata test.
Bug: 985009
Change-Id: I0d52a575764a193302180f52bd5916703185bee6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1746301
Reviewed-by: Bo <[email protected]>
Reviewed-by: Avi Drissman <[email protected]>
Reviewed-by: Tom Sepez <[email protected]>
Reviewed-by: Saman Sami <[email protected]>
Commit-Queue: kylechar <[email protected]>
Cr-Commit-Position: refs/heads/master@{#687371}
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index b976b5bd5..cedf316dc 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -1527,9 +1527,7 @@
// new RenderFrameMetadata, as the IME will need this info to be updated.
// TODO(ericrk): Consider folding the above IPC into RenderFrameMetadata.
// https://crbug.com/912309
- if (IsSurfaceSynchronizationEnabled()) {
- layer_tree_view_->RequestForceSendMetadata();
- }
+ layer_tree_view_->RequestForceSendMetadata();
#endif
}
}
@@ -3000,8 +2998,7 @@
settings.initial_debug_state.SetRecordRenderingStats(
cmd.HasSwitch(cc::switches::kEnableGpuBenchmarking));
- settings.enable_surface_synchronization =
- features::IsSurfaceSynchronizationEnabled();
+ settings.enable_surface_synchronization = true;
settings.build_hit_test_data = features::IsVizHitTestingSurfaceLayerEnabled();
if (cmd.HasSwitch(cc::switches::kSlowDownRasterScaleFactor)) {
@@ -3157,12 +3154,9 @@
settings.enable_latency_recovery = false;
}
#if defined(OS_ANDROID)
- if (features::IsSurfaceSynchronizationEnabled()) {
- // TODO(crbug.com/933846): LatencyRecovery is causing jank on Android.
- // Disable in viz mode for now, with plan to disable more widely once
- // viz launches.
- settings.enable_latency_recovery = false;
- }
+ // TODO(crbug.com/933846): LatencyRecovery is causing jank on Android. Disable
+ // in viz mode for now, with plan to disable more widely once viz launches.
+ settings.enable_latency_recovery = false;
#endif
settings.enable_image_animation_resync =
@@ -3742,11 +3736,6 @@
}
}
-bool RenderWidget::IsSurfaceSynchronizationEnabled() const {
- return layer_tree_view_ &&
- layer_tree_view_->IsSurfaceSynchronizationEnabled();
-}
-
void RenderWidget::UseSynchronousResizeModeForTesting(bool enable) {
synchronous_resize_mode_for_testing_ = enable;
}
