ozone/drm: Only reuse ScanoutBuffers with compatible modifiers

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

Index: ui/ozone/platform/drm/gpu/mock_scanout_buffer.cc
diff --git a/ui/ozone/platform/drm/gpu/mock_scanout_buffer.cc b/ui/ozone/platform/drm/gpu/mock_scanout_buffer.cc
index 91c0082d97914e23404df76981dca81166dee434..dda9d233bd6c29a131b1e5273e11234401cf9316 100644
--- a/ui/ozone/platform/drm/gpu/mock_scanout_buffer.cc
+++ b/ui/ozone/platform/drm/gpu/mock_scanout_buffer.cc
@@ -3,16 +3,29 @@
 // found in the LICENSE file.
 
 #include "ui/ozone/platform/drm/gpu/mock_scanout_buffer.h"
+#include "ui/ozone/platform/drm/gpu/mock_drm_device.h"
+
+namespace {

[dnicoara, 2017/06/15 14:24:43]

nit: Nest anonymous namespace in the ui namespace.

+
+uint32_t currentFramebufferId;

[dnicoara, 2017/06/15 14:24:43]

Global declarations follow the "g_current_framebuffer_id" style.

Also, initialize it to 1.

+}
 
 namespace ui {
 
-MockScanoutBuffer::MockScanoutBuffer(const gfx::Size& size, uint32_t format)
-    : size_(size), format_(format) {}
+MockScanoutBuffer::MockScanoutBuffer(const gfx::Size& size,
+                                     uint32_t format,
+                                     uint64_t modifier,
+                                     const scoped_refptr<DrmDevice>& drm)
+    : size_(size),
+      format_(format),
+      modifier_(modifier),
+      id(currentFramebufferId++),
+      drm_(drm) {}
 
 MockScanoutBuffer::~MockScanoutBuffer() {}
 
 uint32_t MockScanoutBuffer::GetFramebufferId() const {
-  return 1;
+  return id;
 }
 
 uint32_t MockScanoutBuffer::GetOpaqueFramebufferId() const {
@@ -35,8 +48,12 @@ uint32_t MockScanoutBuffer::GetOpaqueFramebufferPixelFormat() const {
   return format_;
 }
 
+uint64_t MockScanoutBuffer::GetFormatModifier() const {
+  return modifier_;
+}
+
 const DrmDevice* MockScanoutBuffer::GetDrmDevice() const {
-  return nullptr;
+  return drm_.get();
 }
 
 bool MockScanoutBuffer::RequiresGlFinish() const {