[ozone/common/drm] Avoid forward declaration on not declared deps.

Make sure forward declaration is not used to just avoid
declaring dependencies in the common/BUILD.gn.

That is, DrmDevice is a drm platform's class, which shouldn't be known
by the ozone/common.

To fix this, return GbmDeviceLinux instead and add AsGbmDeviceLinux method
to the DrmDevice class to return downcasted pointer to self, and move
ScanoutBufferGenerator to drm/gpu as long as it's not needed by the
Wayland with dmabuf approach at this stage.

Bug: 820047
Change-Id: I25703db41234275e0c0cb5aaefe0e61964a50e83
Reviewed-on: https://chromium-review.googlesource.com/1088690Reviewed-by: Michael Spang <spang@chromium.org>
Commit-Queue: Maksim Sisov <msisov@igalia.com>
Cr-Commit-Position: refs/heads/master@{#565574}

ui/ozone/common/linux/scanout_buffer.h

@@ -13,7 +13,7 @@
 
 namespace ui {
 
-class DrmDevice;
+class GbmDeviceLinux;
 
 // Abstraction for a DRM buffer that can be scanned-out of.
 class ScanoutBuffer : public base::RefCountedThreadSafe<ScanoutBuffer> {
@@ -44,7 +44,7 @@ class ScanoutBuffer : public base::RefCountedThreadSafe<ScanoutBuffer> {
   virtual gfx::Size GetSize() const = 0;
 
   // Device on which the buffer was created.
-  virtual const DrmDevice* GetDrmDevice() const = 0;
+  virtual const GbmDeviceLinux* GetGbmDeviceLinux() const = 0;
 
   virtual bool RequiresGlFinish() const = 0;
 
@@ -54,17 +54,6 @@ class ScanoutBuffer : public base::RefCountedThreadSafe<ScanoutBuffer> {
   friend class base::RefCountedThreadSafe<ScanoutBuffer>;
 };
 
-class ScanoutBufferGenerator {
- public:
-  virtual ~ScanoutBufferGenerator() {}
-
-  virtual scoped_refptr<ScanoutBuffer> Create(
-      const scoped_refptr<DrmDevice>& drm,
-      uint32_t format,
-      const std::vector<uint64_t>& modifiers,
-      const gfx::Size& size) = 0;
-};
-
 }  // namespace ui
 
 #endif  // UI_OZONE_COMMON_LINUX_SCANOUT_BUFFER_H_

ui/ozone/platform/drm/BUILD.gn

@@ -78,6 +78,7 @@ source_set("gbm") {
     "gpu/page_flip_request.h",
     "gpu/proxy_helpers.cc",
     "gpu/proxy_helpers.h",
+    "gpu/scanout_buffer_generator.h",
     "gpu/screen_manager.cc",
     "gpu/screen_manager.h",
     "host/drm_cursor.cc",

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

@@ -117,8 +117,8 @@ gfx::Size DrmBuffer::GetSize() const {
   return gfx::Size(surface_->width(), surface_->height());
 }
 
-const DrmDevice* DrmBuffer::GetDrmDevice() const {
-  return drm_.get();
+const GbmDeviceLinux* DrmBuffer::GetGbmDeviceLinux() const {
+  return drm_->AsGbmDeviceLinux();
 }
 
 bool DrmBuffer::RequiresGlFinish() const {

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

@@ -19,6 +19,7 @@ class SkSurface;
 namespace ui {
 
 class DrmDevice;
+class GbmDeviceLinux;
 
 // Wrapper for a DRM allocated buffer. Keeps track of the native properties of
 // the buffer and wraps the pixel memory into a SkSurface which can be used to
@@ -43,7 +44,7 @@ class DrmBuffer : public ScanoutBuffer {
   uint64_t GetFormatModifier() const override;
   uint32_t GetHandle() const override;
   gfx::Size GetSize() const override;
-  const DrmDevice* GetDrmDevice() const override;
+  const GbmDeviceLinux* GetGbmDeviceLinux() const override;
   bool RequiresGlFinish() const override;
 
  protected:

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

@@ -79,6 +79,8 @@ class DrmDevice : public GbmDeviceLinux,
 
   bool allow_addfb2_modifiers() const { return allow_addfb2_modifiers_; }
 
+  const GbmDeviceLinux* AsGbmDeviceLinux() const { return this; }
+
   // Open device.
   virtual bool Initialize();
 

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

@@ -14,6 +14,7 @@
 #include "ui/ozone/platform/drm/gpu/drm_device.h"
 #include "ui/ozone/platform/drm/gpu/drm_window.h"
 #include "ui/ozone/platform/drm/gpu/hardware_display_controller.h"
+#include "ui/ozone/platform/drm/gpu/scanout_buffer_generator.h"
 
 namespace ui {
 

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

@@ -27,6 +27,7 @@
 #include "ui/ozone/platform/drm/gpu/gbm_device.h"
 #include "ui/ozone/platform/drm/gpu/gbm_surface_factory.h"
 #include "ui/ozone/platform/drm/gpu/proxy_helpers.h"
+#include "ui/ozone/platform/drm/gpu/scanout_buffer_generator.h"
 #include "ui/ozone/platform/drm/gpu/screen_manager.h"
 #include "ui/ozone/public/ozone_switches.h"
 

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

@@ -119,7 +119,8 @@ bool DrmWindow::SchedulePageFlip(const std::vector<OverlayPlane>& planes,
   if (controller_) {
     const DrmDevice* drm = controller_->GetAllocationDrmDevice().get();
     for (const auto& plane : planes) {
-      if (plane.buffer && plane.buffer->GetDrmDevice() != drm) {
+      if (plane.buffer &&
+          plane.buffer->GetGbmDeviceLinux() != drm->AsGbmDeviceLinux()) {
         // Although |force_buffer_reallocation_| is set to true during window
         // bounds update, this may still be needed because of in-flight buffers.
         force_buffer_reallocation_ = true;

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

@@ -20,6 +20,7 @@
 #include "third_party/skia/include/core/SkImageInfo.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "ui/gfx/presentation_feedback.h"
+#include "ui/ozone/common/linux/scanout_buffer.h"
 #include "ui/ozone/platform/drm/gpu/drm_device_generator.h"
 #include "ui/ozone/platform/drm/gpu/drm_device_manager.h"
 #include "ui/ozone/platform/drm/gpu/hardware_display_controller.h"

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

@@ -164,8 +164,8 @@ uint64_t GbmBuffer::GetFormatModifier() const {
   return format_modifier_;
 }
 
-const DrmDevice* GbmBuffer::GetDrmDevice() const {
-  return drm_.get();
+const GbmDeviceLinux* GbmBuffer::GetGbmDeviceLinux() const {
+  return drm_->AsGbmDeviceLinux();
 }
 
 bool GbmBuffer::RequiresGlFinish() const {

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

@@ -60,7 +60,7 @@ class GbmBuffer : public ScanoutBuffer {
   uint32_t GetFramebufferPixelFormat() const override;
   uint32_t GetOpaqueFramebufferPixelFormat() const override;
   uint64_t GetFormatModifier() const override;
-  const DrmDevice* GetDrmDevice() const override;
+  const GbmDeviceLinux* GetGbmDeviceLinux() const override;
   bool RequiresGlFinish() const override;
 
  private:

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

@@ -7,10 +7,12 @@
 
 #include "base/macros.h"
 
-#include "ui/ozone/common/linux/scanout_buffer.h"
+#include "ui/ozone/platform/drm/gpu/scanout_buffer_generator.h"
 
 namespace ui {
 
+class ScanoutBuffer;
+
 class MockDumbBufferGenerator : public ScanoutBufferGenerator {
  public:
   MockDumbBufferGenerator();

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

@@ -54,8 +54,8 @@ uint64_t MockScanoutBuffer::GetFormatModifier() const {
   return modifier_;
 }
 
-const DrmDevice* MockScanoutBuffer::GetDrmDevice() const {
-  return drm_.get();
+const GbmDeviceLinux* MockScanoutBuffer::GetGbmDeviceLinux() const {
+  return drm_->AsGbmDeviceLinux();
 }
 
 bool MockScanoutBuffer::RequiresGlFinish() const {

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

@@ -13,6 +13,8 @@
 
 namespace ui {
 
+class DrmDevice;
+
 class MockScanoutBuffer : public ScanoutBuffer {
  public:
   MockScanoutBuffer(const gfx::Size& size,
@@ -28,7 +30,7 @@ class MockScanoutBuffer : public ScanoutBuffer {
   uint32_t GetFramebufferPixelFormat() const override;
   uint32_t GetOpaqueFramebufferPixelFormat() const override;
   uint64_t GetFormatModifier() const override;
-  const DrmDevice* GetDrmDevice() const override;
+  const GbmDeviceLinux* GetGbmDeviceLinux() const override;
   bool RequiresGlFinish() const override;
 
  private:

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

@@ -7,7 +7,7 @@
 
 #include "base/macros.h"
 
-#include "ui/ozone/common/linux/scanout_buffer.h"
+#include "ui/ozone/platform/drm/gpu/scanout_buffer_generator.h"
 
 namespace ui {
 

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

+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_SCANOUT_BUFFER_GENERATOR_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_SCANOUT_BUFFER_GENERATOR_H_
+
+#include <vector>
+
+#include "base/memory/scoped_refptr.h"
+#include "ui/gfx/geometry/size.h"
+
+namespace ui {
+
+class DrmDevice;
+class ScanoutBuffer;
+
+class ScanoutBufferGenerator {
+ public:
+  virtual ~ScanoutBufferGenerator() {}
+
+  virtual scoped_refptr<ScanoutBuffer> Create(
+      const scoped_refptr<DrmDevice>& drm,
+      uint32_t format,
+      const std::vector<uint64_t>& modifiers,
+      const gfx::Size& size) = 0;
+};
+
+}  // namespace ui
+
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_SCANOUT_BUFFER_GENERATOR_H_

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

@@ -21,6 +21,7 @@
 #include "ui/ozone/platform/drm/gpu/drm_device.h"
 #include "ui/ozone/platform/drm/gpu/drm_window.h"
 #include "ui/ozone/platform/drm/gpu/hardware_display_controller.h"
+#include "ui/ozone/platform/drm/gpu/scanout_buffer_generator.h"
 
 namespace ui {
 
@@ -356,7 +357,7 @@ OverlayPlane ScreenManager::GetModesetBuffer(
     const OverlayPlane* primary = window->GetLastModesetBuffer();
     const DrmDevice* drm = controller->GetAllocationDrmDevice().get();
     if (primary && primary->buffer->GetSize() == bounds.size() &&
-        primary->buffer->GetDrmDevice() == drm) {
+        primary->buffer->GetGbmDeviceLinux() == drm->AsGbmDeviceLinux()) {
       // If the controller doesn't advertise modifiers, wont have a
       // modifier either and we can reuse the buffer. Otherwise, check
       // to see if the controller supports the buffers format

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

@@ -11,6 +11,7 @@
 #include "base/files/platform_file.h"
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/ozone/common/linux/scanout_buffer.h"
 #include "ui/ozone/platform/drm/gpu/crtc_controller.h"
 #include "ui/ozone/platform/drm/gpu/drm_device_generator.h"
 #include "ui/ozone/platform/drm/gpu/drm_device_manager.h"