Index: chrome/browser/media/native_desktop_media_list.cc |
diff --git a/chrome/browser/media/native_desktop_media_list.cc b/chrome/browser/media/native_desktop_media_list.cc |
index 7849bbe822e8d8c02bae448723a010084346d9ba..15b781d29cd6b4b2e6ec7dbfc74fb4c104808ff6 100644 |
--- a/chrome/browser/media/native_desktop_media_list.cc |
+++ b/chrome/browser/media/native_desktop_media_list.cc |
@@ -96,7 +96,8 @@ class NativeDesktopMediaList::Worker |
typedef std::map<DesktopMediaID, uint32_t> ImageHashesMap; |
// webrtc::DesktopCapturer::Callback interface. |
- void OnCaptureCompleted(webrtc::DesktopFrame* frame) override; |
+ void OnCaptureResult(webrtc::DesktopCapturer::Result result, |
+ std::unique_ptr<webrtc::DesktopFrame> frame) override; |
base::WeakPtr<NativeDesktopMediaList> media_list_; |
@@ -225,9 +226,11 @@ void NativeDesktopMediaList::Worker::RefreshThumbnails( |
media_list_)); |
} |
-void NativeDesktopMediaList::Worker::OnCaptureCompleted( |
- webrtc::DesktopFrame* frame) { |
- current_frame_.reset(frame); |
+void NativeDesktopMediaList::Worker::OnCaptureResult( |
+ webrtc::DesktopCapturer::Result result, |
+ std::unique_ptr<webrtc::DesktopFrame> frame) { |
+ if (frame) |
+ current_frame_ = std::move(frame); |
Wez
2016/06/17 05:57:16
You're changing the semantics such that the deskto
Sergey Ulanov
2016/06/17 14:59:54
You are right. current_frame_ may actually be from
|
} |
NativeDesktopMediaList::NativeDesktopMediaList( |