Restrict DisableSwapUntilResize to Windows

This mojo call was added for crbug.com/811945 to fix a Windows-specific
bug. Restrict it to only be enabled on Windows.

Bug: 1042259
Change-Id: I52f1f348e1de52e2d09a376e80852e1b8ae84d23
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2063417Reviewed-by: Ken Buchanan <kenrb@chromium.org>
Reviewed-by: kylechar <kylechar@chromium.org>
Commit-Queue: Sean Gilhuly <sgilhuly@chromium.org>
Cr-Commit-Position: refs/heads/master@{#742812}

components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc

@@ -166,10 +166,12 @@ void RootCompositorFrameSinkImpl::SetDisplayVisible(bool visible) {
   display_->SetVisible(visible);
 }
 
+#if defined(OS_WIN)
 void RootCompositorFrameSinkImpl::DisableSwapUntilResize(
     DisableSwapUntilResizeCallback callback) {
   display_->DisableSwapUntilResize(std::move(callback));
 }
+#endif
 
 void RootCompositorFrameSinkImpl::Resize(const gfx::Size& size) {
   display_->Resize(size);

components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h

@@ -50,7 +50,9 @@ class RootCompositorFrameSinkImpl : public mojom::CompositorFrameSink,
 
   // mojom::DisplayPrivate:
   void SetDisplayVisible(bool visible) override;
+#if defined(OS_WIN)
   void DisableSwapUntilResize(DisableSwapUntilResizeCallback callback) override;
+#endif
   void Resize(const gfx::Size& size) override;
   void SetDisplayColorMatrix(const gfx::Transform& color_matrix) override;
   void SetDisplayColorSpaces(

services/viz/privileged/mojom/compositing/display_private.mojom

@@ -23,7 +23,8 @@ interface DisplayPrivate {
 
   // Attempts to immediately swap a frame with the current size if possible,
   // then will no longer swap until Resize() is called with a non-empty size.
-  [Sync] DisableSwapUntilResize() => ();
+  [EnableIf=is_win, Sync]
+  DisableSwapUntilResize() => ();
 
   // Resizes the display.
   Resize(gfx.mojom.Size size);

ui/compositor/compositor.cc

@@ -38,7 +38,6 @@
 #include "components/viz/common/switches.h"
 #include "components/viz/host/host_frame_sink_manager.h"
 #include "components/viz/host/renderer_settings_creation.h"
-#include "mojo/public/cpp/bindings/sync_call_restrictions.h"
 #include "services/viz/privileged/mojom/compositing/display_private.mojom.h"
 #include "services/viz/privileged/mojom/compositing/external_begin_frame_controller.mojom.h"
 #include "services/viz/privileged/mojom/compositing/vsync_parameter_observer.mojom.h"
@@ -57,6 +56,10 @@
 #include "ui/gfx/switches.h"
 #include "ui/gl/gl_switches.h"
 
+#if defined(OS_WIN)
+#include "mojo/public/cpp/bindings/sync_call_restrictions.h"
+#endif
+
 namespace ui {
 
 // Used to hold on to IssueExternalBeginFrame arguments if
@@ -385,6 +388,7 @@ void Compositor::ScheduleRedrawRect(const gfx::Rect& damage_rect) {
   host_->SetNeedsCommit();
 }
 
+#if defined(OS_WIN)
 void Compositor::DisableSwapUntilResize() {
   if (display_private_) {
     // Browser needs to block for Viz to receive and process this message.
@@ -403,6 +407,7 @@ void Compositor::ReenableSwap() {
   if (display_private_)
     display_private_->Resize(size_);
 }
+#endif
 
 void Compositor::SetScaleAndSize(
     float scale,

ui/compositor/compositor.h

@@ -197,10 +197,12 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
   // from changes to layer properties.
   void ScheduleRedrawRect(const gfx::Rect& damage_rect);
 
+#if defined(OS_WIN)
   // Attempts to immediately swap a frame with the current size if possible,
   // then disables swapping on this surface until it is resized.
   void DisableSwapUntilResize();
   void ReenableSwap();
+#endif
 
   // Sets the compositor's device scale factor and size.
   void SetScaleAndSize(

ui/compositor/test/in_process_context_factory.cc

@@ -158,6 +158,7 @@ class InProcessContextFactory::PerCompositorData
     display_->SetVisible(visible);
   }
   void Resize(const gfx::Size& size) override { display_->Resize(size); }
+#if defined(OS_WIN)
   bool DisableSwapUntilResize() override {
     display_->DisableSwapUntilResize(base::OnceClosure());
     return true;
@@ -166,6 +167,7 @@ class InProcessContextFactory::PerCompositorData
       DisableSwapUntilResizeCallback callback) override {
     display_->DisableSwapUntilResize(std::move(callback));
   }
+#endif
   void SetDisplayColorMatrix(const gfx::Transform& matrix) override {
     output_color_matrix_ = matrix.matrix();
   }