viz: SkiaOutputSurface Checks OutputDevice for SchedulePrimaryPlane

SkiaOutputSUrface checks the OutputDevice implementation for whether it
supports scheduling the primary plane as overlay. This is to match
GLOutputSurface's behavior, where only the BufferQueue implementation
would return true for IsDisplayedAsOverlay(). This also helps avoid
the case where a Surfaceless GLSurface is created for
SkiaOutputDeviceGL.

R=kylechar

Change-Id: Iadfce3551f90e2049db73ed33dfff6ad042c4ccf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2095142Reviewed-by: kylechar <kylechar@chromium.org>
Commit-Queue: weiliangc <weiliangc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#749269}

components/viz/service/display_embedder/skia_output_device.cc

@@ -46,6 +46,10 @@ void SkiaOutputDevice::SetGpuVSyncEnabled(bool enabled) {
   NOTIMPLEMENTED();
 }
 
+bool SkiaOutputDevice::IsPrimaryPlaneOverlay() const {
+  return false;
+}
+
 void SkiaOutputDevice::SchedulePrimaryPlane(
     const OverlayProcessorInterface::OutputSurfaceOverlayPlane& plane) {
   NOTIMPLEMENTED();

components/viz/service/display_embedder/skia_output_device.h

@@ -99,6 +99,9 @@ class SkiaOutputDevice {
 
   virtual void SetGpuVSyncEnabled(bool enabled);
 
+  // Whether the output device's primary plane is an overlay. This returns true
+  // is the SchedulePrimaryPlane function is implemented.
+  virtual bool IsPrimaryPlaneOverlay() const;
   // Schedule the output device's back buffer as an overlay plane. The scheduled
   // primary plane will be on screen when SwapBuffers() or PostSubBuffer() is
   // called.

components/viz/service/display_embedder/skia_output_device_buffer_queue.cc

@@ -407,6 +407,10 @@ void SkiaOutputDeviceBufferQueue::FreeAllSurfaces() {
   available_images_.clear();
 }
 
+bool SkiaOutputDeviceBufferQueue::IsPrimaryPlaneOverlay() const {
+  return true;
+}
+
 void SkiaOutputDeviceBufferQueue::SchedulePrimaryPlane(
     const OverlayProcessorInterface::OutputSurfaceOverlayPlane& plane) {
   // If the current_image_ is nullptr, it means there is no change on the

components/viz/service/display_embedder/skia_output_device_buffer_queue.h

@@ -57,6 +57,7 @@ class VIZ_SERVICE_EXPORT SkiaOutputDeviceBufferQueue final
   std::vector<GrBackendSemaphore> TakeEndPaintSemaphores(void) override;
   bool supports_alpha() { return true; }
 
+  bool IsPrimaryPlaneOverlay() const override;
   void SchedulePrimaryPlane(
       const OverlayProcessorInterface::OutputSurfaceOverlayPlane& plane)
       override;

components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc

@@ -990,6 +990,7 @@ void SkiaOutputSurfaceImplOnGpu::SwapBuffers(
   scoped_output_device_paint_.reset();
 
   if (output_surface_plane_) {
+    DCHECK(output_device_->IsPrimaryPlaneOverlay());
     output_device_->SchedulePrimaryPlane(output_surface_plane_.value());
     output_surface_plane_.reset();
   }
@@ -1646,7 +1647,7 @@ void SkiaOutputSurfaceImplOnGpu::ReleaseFenceSyncAndPushTextureUpdates(
 }
 
 bool SkiaOutputSurfaceImplOnGpu::IsDisplayedAsOverlay() {
-  return gl_surface_ ? gl_surface_->IsSurfaceless() : false;
+  return output_device_->IsPrimaryPlaneOverlay();
 }
 
 #if defined(OS_WIN)