4057e6b56e
desktopCapture.getSources() returns a promise which should resolve when capturing finishes. Internally it creates an instance of DesktopCapturer which is responsible for resolving or rejecting the promise. Between the time DesktopCapturer starts capturing frames and when it finishes, it's possible for its handle to be GC'd leading to it never resolving. These changes pin the instance of DesktopCapturer until it either finishes or errors. fixes #25595
84 lines
2.6 KiB
C++
84 lines
2.6 KiB
C++
// Copyright (c) 2015 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#ifndef SHELL_BROWSER_API_ELECTRON_API_DESKTOP_CAPTURER_H_
|
|
#define SHELL_BROWSER_API_ELECTRON_API_DESKTOP_CAPTURER_H_
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "chrome/browser/media/webrtc/desktop_media_list_observer.h"
|
|
#include "chrome/browser/media/webrtc/native_desktop_media_list.h"
|
|
#include "gin/handle.h"
|
|
#include "gin/wrappable.h"
|
|
#include "shell/common/gin_helper/pinnable.h"
|
|
|
|
namespace electron {
|
|
|
|
namespace api {
|
|
|
|
class DesktopCapturer : public gin::Wrappable<DesktopCapturer>,
|
|
public gin_helper::Pinnable<DesktopCapturer>,
|
|
public DesktopMediaListObserver {
|
|
public:
|
|
struct Source {
|
|
DesktopMediaList::Source media_list_source;
|
|
// Will be an empty string if not available.
|
|
std::string display_id;
|
|
|
|
// Whether or not this source should provide an icon.
|
|
bool fetch_icon = false;
|
|
};
|
|
|
|
static gin::Handle<DesktopCapturer> Create(v8::Isolate* isolate);
|
|
|
|
void StartHandling(bool capture_window,
|
|
bool capture_screen,
|
|
const gfx::Size& thumbnail_size,
|
|
bool fetch_window_icons);
|
|
|
|
// gin::Wrappable
|
|
static gin::WrapperInfo kWrapperInfo;
|
|
gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
|
|
v8::Isolate* isolate) override;
|
|
const char* GetTypeName() override;
|
|
|
|
protected:
|
|
explicit DesktopCapturer(v8::Isolate* isolate);
|
|
~DesktopCapturer() override;
|
|
|
|
// DesktopMediaListObserver:
|
|
void OnSourceAdded(DesktopMediaList* list, int index) override {}
|
|
void OnSourceRemoved(DesktopMediaList* list, int index) override {}
|
|
void OnSourceMoved(DesktopMediaList* list,
|
|
int old_index,
|
|
int new_index) override {}
|
|
void OnSourceNameChanged(DesktopMediaList* list, int index) override {}
|
|
void OnSourceThumbnailChanged(DesktopMediaList* list, int index) override {}
|
|
void OnSourceUnchanged(DesktopMediaList* list) override;
|
|
|
|
private:
|
|
void UpdateSourcesList(DesktopMediaList* list);
|
|
|
|
std::unique_ptr<DesktopMediaList> window_capturer_;
|
|
std::unique_ptr<DesktopMediaList> screen_capturer_;
|
|
std::vector<DesktopCapturer::Source> captured_sources_;
|
|
bool capture_window_ = false;
|
|
bool capture_screen_ = false;
|
|
bool fetch_window_icons_ = false;
|
|
#if defined(OS_WIN)
|
|
bool using_directx_capturer_ = false;
|
|
#endif // defined(OS_WIN)
|
|
|
|
base::WeakPtrFactory<DesktopCapturer> weak_ptr_factory_{this};
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(DesktopCapturer);
|
|
};
|
|
|
|
} // namespace api
|
|
|
|
} // namespace electron
|
|
|
|
#endif // SHELL_BROWSER_API_ELECTRON_API_DESKTOP_CAPTURER_H_
|