ozone: drm: Inline RequiresGlFinish()

No functional change. This is needed prior to some refactoring.

Bug: 869206

Change-Id: I2db96c903b64b50ac8e33739263cdbb0297bde2f
Reviewed-on: https://chromium-review.googlesource.com/1155910
Commit-Queue: Michael Spang <spang@chromium.org>
Reviewed-by: Daniele Castagna <dcastagna@chromium.org>
Cr-Commit-Position: refs/heads/master@{#579503}

ui/ozone/platform/drm/gpu/drm_buffer.cc

@@ -121,8 +121,4 @@ const DrmDevice* DrmBuffer::GetDrmDevice() const {
   return drm_.get();
 }
 
-bool DrmBuffer::RequiresGlFinish() const {
-  return false;
-}
-
 }  // namespace ui

ui/ozone/platform/drm/gpu/drm_buffer.h

@@ -44,7 +44,6 @@ class DrmBuffer : public ScanoutBuffer {
   uint32_t GetHandle() const override;
   gfx::Size GetSize() const override;
   const DrmDevice* GetDrmDevice() const override;
-  bool RequiresGlFinish() const override;
 
  protected:
   ~DrmBuffer() override;

ui/ozone/platform/drm/gpu/gbm_buffer.cc

@@ -131,10 +131,6 @@ const DrmDevice* GbmBuffer::GetDrmDevice() const {
   return drm_.get();
 }
 
-bool GbmBuffer::RequiresGlFinish() const {
-  return !drm_->is_primary_device();
-}
-
 scoped_refptr<GbmBuffer> GbmBuffer::CreateBufferForBO(
     const scoped_refptr<GbmDevice>& gbm,
     struct gbm_bo* bo,

ui/ozone/platform/drm/gpu/gbm_buffer.h

@@ -51,7 +51,6 @@ class GbmBuffer : public ScanoutBuffer {
   uint32_t GetHandle() const override;
   gfx::Size GetSize() const override;
   const DrmDevice* GetDrmDevice() const override;
-  bool RequiresGlFinish() const override;
 
  private:
   GbmBuffer(const scoped_refptr<GbmDevice>& gbm,

ui/ozone/platform/drm/gpu/gbm_surfaceless.cc

@@ -13,6 +13,7 @@
 #include "ui/gfx/gpu_fence.h"
 #include "ui/gfx/presentation_feedback.h"
 #include "ui/ozone/common/egl_util.h"
+#include "ui/ozone/platform/drm/gpu/drm_device.h"
 #include "ui/ozone/platform/drm/gpu/drm_vsync_provider.h"
 #include "ui/ozone/platform/drm/gpu/drm_window_proxy.h"
 #include "ui/ozone/platform/drm/gpu/gbm_surface_factory.h"
@@ -45,7 +46,8 @@ GbmSurfaceless::GbmSurfaceless(GbmSurfaceFactory* surface_factory,
 }
 
 void GbmSurfaceless::QueueOverlayPlane(DrmOverlayPlane plane) {
-  is_on_external_drm_device_ = plane.buffer->RequiresGlFinish();
+  is_on_external_drm_device_ =
+      !plane.buffer->GetDrmDevice()->is_primary_device();
   planes_.push_back(std::move(plane));
 }
 

ui/ozone/platform/drm/gpu/mock_scanout_buffer.cc

@@ -58,8 +58,4 @@ const DrmDevice* MockScanoutBuffer::GetDrmDevice() const {
   return drm_.get();
 }
 
-bool MockScanoutBuffer::RequiresGlFinish() const {
-  return false;
-}
-
 }  // namespace ui

ui/ozone/platform/drm/gpu/mock_scanout_buffer.h

@@ -31,7 +31,6 @@ class MockScanoutBuffer : public ScanoutBuffer {
   uint32_t GetOpaqueFramebufferPixelFormat() const override;
   uint64_t GetFormatModifier() const override;
   const DrmDevice* GetDrmDevice() const override;
-  bool RequiresGlFinish() const override;
 
  private:
   ~MockScanoutBuffer() override;

ui/ozone/platform/drm/gpu/scanout_buffer.h

@@ -46,8 +46,6 @@ class ScanoutBuffer : public base::RefCountedThreadSafe<ScanoutBuffer> {
   // Device on which the buffer was created.
   virtual const DrmDevice* GetDrmDevice() const = 0;
 
-  virtual bool RequiresGlFinish() const = 0;
-
  protected:
   virtual ~ScanoutBuffer() {}