| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 2  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 
| 3  * | 3  * | 
| 4  *  Use of this source code is governed by a BSD-style license | 4  *  Use of this source code is governed by a BSD-style license | 
| 5  *  that can be found in the LICENSE file in the root of the source | 5  *  that can be found in the LICENSE file in the root of the source | 
| 6  *  tree. An additional intellectual property rights grant can be found | 6  *  tree. An additional intellectual property rights grant can be found | 
| 7  *  in the file PATENTS.  All contributing project authors may | 7  *  in the file PATENTS.  All contributing project authors may | 
| 8  *  be found in the AUTHORS file in the root of the source tree. | 8  *  be found in the AUTHORS file in the root of the source tree. | 
| 9  */ | 9  */ | 
| 10 | 10 | 
| 11 #include "webrtc/modules/desktop_capture/win/d3d_device.h" | 11 #include "webrtc/modules/desktop_capture/win/d3d_device.h" | 
| 12 | 12 | 
| 13 #include <utility> | 13 #include <utility> | 
| 14 | 14 | 
| 15 #include "webrtc/system_wrappers/include/logging.h" | 15 #include "webrtc/system_wrappers/include/logging.h" | 
| 16 | 16 | 
| 17 namespace webrtc { | 17 namespace webrtc { | 
| 18 | 18 | 
| 19 using Microsoft::WRL::ComPtr; | 19 using Microsoft::WRL::ComPtr; | 
| 20 | 20 | 
| 21 D3dDevice::D3dDevice() = default; | 21 D3dDevice::D3dDevice() = default; | 
|  | 22 D3dDevice::D3dDevice(const D3dDevice& other) = default; | 
|  | 23 D3dDevice::D3dDevice(D3dDevice&& other) = default; | 
| 22 D3dDevice::~D3dDevice() = default; | 24 D3dDevice::~D3dDevice() = default; | 
| 23 | 25 | 
| 24 bool D3dDevice::Initialize(const ComPtr<IDXGIAdapter>& adapter) { | 26 bool D3dDevice::Initialize(const ComPtr<IDXGIAdapter>& adapter) { | 
| 25   dxgi_adapter_ = adapter; | 27   dxgi_adapter_ = adapter; | 
| 26   if (!dxgi_adapter_) { | 28   if (!dxgi_adapter_) { | 
| 27     LOG(LS_WARNING) << "An empty IDXGIAdapter instance has been received."; | 29     LOG(LS_WARNING) << "An empty IDXGIAdapter instance has been received."; | 
| 28     return false; | 30     return false; | 
| 29   } | 31   } | 
| 30 | 32 | 
| 31   D3D_FEATURE_LEVEL feature_level; | 33   D3D_FEATURE_LEVEL feature_level; | 
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 83       LOG(LS_WARNING) << "IDXGIFactory1::EnumAdapters returns an unexpected " | 85       LOG(LS_WARNING) << "IDXGIFactory1::EnumAdapters returns an unexpected " | 
| 84                          "error " | 86                          "error " | 
| 85                       << error.ErrorMessage() << " with code " << error.Error(); | 87                       << error.ErrorMessage() << " with code " << error.Error(); | 
| 86       return std::vector<D3dDevice>(); | 88       return std::vector<D3dDevice>(); | 
| 87     } | 89     } | 
| 88   } | 90   } | 
| 89   return result; | 91   return result; | 
| 90 } | 92 } | 
| 91 | 93 | 
| 92 }  // namespace webrtc | 94 }  // namespace webrtc | 
| OLD | NEW | 
|---|