Revert "[motionmark] Avoid unnecessary IPC on mac."
This reverts
https://chromium-review.googlesource.com/c/chromium/src/+/2923689
It caused us to never hit 120 Hz on ProMotion displays. Revert until
we can figure out a fix.
(cherry picked from commit be623b0f4b884883141fc5735b2ccf762abfc1bc)
Bug: 1274172
Change-Id: Ia09bb0fdaf63509e08755346844dc58b59d8bb6a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3488608
Commit-Queue: Nico Weber <thakis@chromium.org>
Auto-Submit: Nico Weber <thakis@chromium.org>
Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org>
Commit-Queue: Sadrul Chowdhury <sadrul@chromium.org>
Cr-Original-Commit-Position: refs/heads/main@{#974729}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3500725
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/4844@{#969}
Cr-Branched-From: 007241ce2e6c8e5a7b306cc36c730cd07cd38825-refs/heads/main@{#961656}
diff --git a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
index 5362650..d272c371 100644
--- a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
+++ b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
@@ -508,13 +508,10 @@
void RootCompositorFrameSinkImpl::DisplayDidReceiveCALayerParams(
const gfx::CALayerParams& ca_layer_params) {
- if (last_ca_layer_params_ == ca_layer_params)
- return;
#if BUILDFLAG(IS_APPLE)
// If |ca_layer_params| should have content only when there exists a client
// to send it to.
DCHECK(ca_layer_params.is_empty || display_client_);
- last_ca_layer_params_ = ca_layer_params;
if (display_client_)
display_client_->OnDisplayReceivedCALayerParams(ca_layer_params);
#else
diff --git a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h
index 2bb4df6..97d2f93 100644
--- a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h
+++ b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h
@@ -193,8 +193,6 @@
gfx::Size last_swap_pixel_size_;
#endif
- gfx::CALayerParams last_ca_layer_params_;
-
#if BUILDFLAG(IS_ANDROID)
// Let client control whether it wants `DidCompleteSwapWithSize`.
bool enable_swap_competion_callback_ = false;
diff --git a/ui/gfx/ca_layer_params.h b/ui/gfx/ca_layer_params.h
index 12e115c..c5fb29b3 100644
--- a/ui/gfx/ca_layer_params.h
+++ b/ui/gfx/ca_layer_params.h
@@ -25,16 +25,6 @@
CALayerParams& operator=(const CALayerParams& params);
~CALayerParams();
- bool operator==(const CALayerParams& params) const {
- return is_empty == params.is_empty &&
- ca_context_id == params.ca_context_id &&
-#if BUILDFLAG(IS_MAC)
- io_surface_mach_port == params.io_surface_mach_port &&
-#endif
- pixel_size == params.pixel_size &&
- scale_factor == params.scale_factor;
- }
-
// The |is_empty| flag is used to short-circuit code to handle CALayerParams
// on non-macOS platforms.
bool is_empty = true;
