ozone/drm: Only reuse ScanoutBuffers with compatible modifiers

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

 // Copyright 2015 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.
 
 #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 {
   return 2;
 }
 
 uint32_t MockScanoutBuffer::GetHandle() const {
   return 0;
 }
 
 gfx::Size MockScanoutBuffer::GetSize() const {
   return size_;
 }
 
 uint32_t MockScanoutBuffer::GetFramebufferPixelFormat() const {
   return format_;
 }
 
 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 {
   return false;
 }
 
 }  // namespace ui