gpu: Take surface handle into account when importing buffers.

ui/ozone/platform/drm/gpu/drm_thread.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/drm_thread.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 93 matching lines @@
                              gfx::BufferFormat format,
                              gfx::BufferUsage usage,
                              scoped_refptr<GbmBuffer>* buffer) {
   scoped_refptr<GbmDevice> gbm =
       static_cast<GbmDevice*>(device_manager_->GetDrmDevice(widget).get());
   DCHECK(gbm);
   *buffer = GbmBuffer::CreateBuffer(gbm, format, size, usage);
 }
 
 void DrmThread::CreateBufferFromFds(
+    gfx::AcceleratedWidget widget,
     const gfx::Size& size,
     gfx::BufferFormat format,
     std::vector<base::ScopedFD>&& fds,
     const std::vector<gfx::NativePixmapPlane>& planes,
     scoped_refptr<GbmBuffer>* buffer) {
   scoped_refptr<GbmDevice> gbm =
-      static_cast<GbmDevice*>(device_manager_->GetPrimaryDrmDevice().get());
+      static_cast<GbmDevice*>(device_manager_->GetDrmDevice(widget).get());
   DCHECK(gbm);
   *buffer =
       GbmBuffer::CreateBufferFromFds(gbm, format, size, std::move(fds), planes);
 }
 
 void DrmThread::GetScanoutFormats(
     gfx::AcceleratedWidget widget,
     std::vector<gfx::BufferFormat>* scanout_formats) {
   display_manager_->GetScanoutFormats(widget, scanout_formats);
 }
@@ skipping 116 matching lines @@
 void DrmThread::SetColorCorrection(
     int64_t display_id,
     const std::vector<GammaRampRGBEntry>& degamma_lut,
     const std::vector<GammaRampRGBEntry>& gamma_lut,
     const std::vector<float>& correction_matrix) {
   display_manager_->SetColorCorrection(display_id, degamma_lut, gamma_lut,
                                        correction_matrix);
 }
 
 }  // namespace ui