gpu: Take surface handle into account when importing buffers.

ui/ozone/platform/drm/gpu/drm_device_manager.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_device_manager.h"
 
 #include <utility>
 
 #include "base/file_descriptor_posix.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 72 matching lines @@
   if (it != drm_device_map_.end())
     drm_device_map_.erase(it);
 }
 
 scoped_refptr<DrmDevice> DrmDeviceManager::GetDrmDevice(
     gfx::AcceleratedWidget widget) {
   if (widget == gfx::kNullAcceleratedWidget)
     return primary_device_;
 
   auto it = drm_device_map_.find(widget);
-  DCHECK(it != drm_device_map_.end())
+  DLOG_IF(WARNING, it == drm_device_map_.end())
       << "Attempting to get device for unknown widget " << widget;
   // If the widget isn't associated with a display (headless mode) we can
   // allocate buffers from any controller since they will never be scanned out.
   // Use the primary DRM device as a fallback when allocating these buffers.
-  if (!it->second)
+  if (it == drm_device_map_.end() || !it->second)
     return primary_device_;
 
   return it->second;
 }
 
 scoped_refptr<DrmDevice> DrmDeviceManager::GetPrimaryDrmDevice() {
   return primary_device_;
 }
 
 const DrmDeviceVector& DrmDeviceManager::GetDrmDevices() const {
   return devices_;
 }
 
 }  // namespace ui