| 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 "webrtc/system_wrappers/interface/logging.h" | 13 #include "webrtc/system_wrappers/include/logging.h" |
| 14 | 14 |
| 15 namespace webrtc { | 15 namespace webrtc { |
| 16 | 16 |
| 17 DesktopFrameWin::DesktopFrameWin(DesktopSize size, | 17 DesktopFrameWin::DesktopFrameWin(DesktopSize size, |
| 18 int stride, | 18 int stride, |
| 19 uint8_t* data, | 19 uint8_t* data, |
| 20 SharedMemory* shared_memory, | 20 SharedMemory* shared_memory, |
| 21 HBITMAP bitmap) | 21 HBITMAP bitmap) |
| 22 : DesktopFrame(size, stride, data, shared_memory), | 22 : DesktopFrame(size, stride, data, shared_memory), |
| 23 bitmap_(bitmap), | 23 bitmap_(bitmap), |
| (...skipping 30 matching lines...) Expand all Loading... |
| 54 delete shared_memory; | 54 delete shared_memory; |
| 55 return NULL; | 55 return NULL; |
| 56 } | 56 } |
| 57 | 57 |
| 58 return new DesktopFrameWin(size, bytes_per_row, | 58 return new DesktopFrameWin(size, bytes_per_row, |
| 59 reinterpret_cast<uint8_t*>(data), | 59 reinterpret_cast<uint8_t*>(data), |
| 60 shared_memory, bitmap); | 60 shared_memory, bitmap); |
| 61 } | 61 } |
| 62 | 62 |
| 63 } // namespace webrtc | 63 } // namespace webrtc |
| OLD | NEW |