| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 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/desktop_frame_win.h" | 11 #include "webrtc/modules/desktop_capture/desktop_frame_win.h" |
| 12 | 12 |
| 13 #include <utility> | 13 #include <utility> |
| 14 | 14 |
| 15 #include "webrtc/system_wrappers/include/logging.h" | 15 #include "webrtc/base/logging.h" |
| 16 | 16 |
| 17 namespace webrtc { | 17 namespace webrtc { |
| 18 | 18 |
| 19 DesktopFrameWin::DesktopFrameWin(DesktopSize size, | 19 DesktopFrameWin::DesktopFrameWin(DesktopSize size, |
| 20 int stride, | 20 int stride, |
| 21 uint8_t* data, | 21 uint8_t* data, |
| 22 std::unique_ptr<SharedMemory> shared_memory, | 22 std::unique_ptr<SharedMemory> shared_memory, |
| 23 HBITMAP bitmap) | 23 HBITMAP bitmap) |
| 24 : DesktopFrame(size, stride, data, shared_memory.get()), | 24 : DesktopFrame(size, stride, data, shared_memory.get()), |
| 25 bitmap_(bitmap), | 25 bitmap_(bitmap), |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 LOG(LS_WARNING) << "Failed to allocate new window frame " << GetLastError(); | 59 LOG(LS_WARNING) << "Failed to allocate new window frame " << GetLastError(); |
| 60 return nullptr; | 60 return nullptr; |
| 61 } | 61 } |
| 62 | 62 |
| 63 return std::unique_ptr<DesktopFrameWin>( | 63 return std::unique_ptr<DesktopFrameWin>( |
| 64 new DesktopFrameWin(size, bytes_per_row, reinterpret_cast<uint8_t*>(data), | 64 new DesktopFrameWin(size, bytes_per_row, reinterpret_cast<uint8_t*>(data), |
| 65 std::move(shared_memory), bitmap)); | 65 std::move(shared_memory), bitmap)); |
| 66 } | 66 } |
| 67 | 67 |
| 68 } // namespace webrtc | 68 } // namespace webrtc |
| OLD | NEW |