| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2014 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 |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 selected_window_ = id; | 67 selected_window_ = id; |
| 68 return true; | 68 return true; |
| 69 } | 69 } |
| 70 return false; | 70 return false; |
| 71 } | 71 } |
| 72 | 72 |
| 73 bool CroppingWindowCapturer::BringSelectedWindowToFront() { | 73 bool CroppingWindowCapturer::BringSelectedWindowToFront() { |
| 74 return window_capturer_->BringSelectedWindowToFront(); | 74 return window_capturer_->BringSelectedWindowToFront(); |
| 75 } | 75 } |
| 76 | 76 |
| 77 void CroppingWindowCapturer::OnCaptureCompleted(DesktopFrame* frame) { | 77 void CroppingWindowCapturer::OnCaptureCompleted( |
| 78 std::unique_ptr<DesktopFrame> screen_frame(frame); | 78 std::unique_ptr<DesktopFrame> screen_frame) { |
| 79 | |
| 80 if (!ShouldUseScreenCapturer()) { | 79 if (!ShouldUseScreenCapturer()) { |
| 81 LOG(LS_INFO) << "Window no longer on top when ScreenCapturer finishes"; | 80 LOG(LS_INFO) << "Window no longer on top when ScreenCapturer finishes"; |
| 82 window_capturer_->Capture(DesktopRegion()); | 81 window_capturer_->Capture(DesktopRegion()); |
| 83 return; | 82 return; |
| 84 } | 83 } |
| 85 | 84 |
| 86 if (!frame) { | 85 if (!screen_frame) { |
| 87 LOG(LS_WARNING) << "ScreenCapturer failed to capture a frame"; | 86 LOG(LS_WARNING) << "ScreenCapturer failed to capture a frame"; |
| 88 callback_->OnCaptureCompleted(NULL); | 87 callback_->OnCaptureCompleted(std::unique_ptr<DesktopFrame>()); |
| 89 return; | 88 return; |
| 90 } | 89 } |
| 91 | 90 |
| 92 DesktopRect window_rect = GetWindowRectInVirtualScreen(); | 91 DesktopRect window_rect = GetWindowRectInVirtualScreen(); |
| 93 if (window_rect.is_empty()) { | 92 if (window_rect.is_empty()) { |
| 94 LOG(LS_WARNING) << "Window rect is empty"; | 93 LOG(LS_WARNING) << "Window rect is empty"; |
| 95 callback_->OnCaptureCompleted(NULL); | 94 callback_->OnCaptureCompleted(std::unique_ptr<DesktopFrame>()); |
| 96 return; | 95 return; |
| 97 } | 96 } |
| 98 | 97 |
| 99 std::unique_ptr<DesktopFrame> window_frame( | 98 callback_->OnCaptureCompleted( |
| 100 CreateCroppedDesktopFrame(screen_frame.release(), window_rect)); | 99 CreateCroppedDesktopFrame(std::move(screen_frame), window_rect)); |
| 101 callback_->OnCaptureCompleted(window_frame.release()); | |
| 102 } | 100 } |
| 103 | 101 |
| 104 #if !defined(WEBRTC_WIN) | 102 #if !defined(WEBRTC_WIN) |
| 105 // static | 103 // static |
| 106 WindowCapturer* | 104 WindowCapturer* |
| 107 CroppingWindowCapturer::Create(const DesktopCaptureOptions& options) { | 105 CroppingWindowCapturer::Create(const DesktopCaptureOptions& options) { |
| 108 return WindowCapturer::Create(options); | 106 return WindowCapturer::Create(options); |
| 109 } | 107 } |
| 110 #endif | 108 #endif |
| 111 | 109 |
| 112 } // namespace webrtc | 110 } // namespace webrtc |
| OLD | NEW |