mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Add options check.

Browse source 
This patch avoids main process never response back to renderer if the options is
invalid.
This commit is contained in:
Haojian Wu 2015-10-19 10:54:12 +08:00
parent 214f8477b3
commit fb4efec55d
4 changed files with 37 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

37
atom/browser/api/atom_api_desktop_capturer.cc
View file

@ -41,6 +41,24 @@ namespace api {
namespace {
const int kThumbnailWidth = 150;
const int kThumbnailHeight = 150;
bool GetCapturerTypes(const mate::Dictionary& args,
bool* show_windows,
bool* show_screens) {
*show_windows = false;
*show_screens = false;
std::vector<std::string> sources;
if (!args.Get("types", &sources))
return false;
for (const auto& source_type : sources) {
if (source_type == "screen")
*show_screens = true;
else if (source_type == "window")
*show_windows = true;
}
return !show_windows && !show_screens ? false : true;
}
} // namespace
DesktopCapturer::DesktopCapturer() {
@ -50,21 +68,14 @@ DesktopCapturer::~DesktopCapturer() {
}
void DesktopCapturer::StartHandling(const mate::Dictionary& args) {
std::vector<std::string> sources;
if (!args.Get("types", &sources))
return;
bool show_screens = false;
bool show_windows = false;
for (const auto& source_type : sources) {
if (source_type == "screen")
show_screens = true;
else if (source_type == "window")
show_windows = true;
}
if (!show_windows && !show_screens)
if (!GetCapturerTypes(args, &show_windows, &show_screens)) {
Emit("handling-finished",
"Invalid options.",
std::vector<DesktopMediaList::Source>());
return;
}
webrtc::DesktopCaptureOptions options =
webrtc::DesktopCaptureOptions::CreateDefault();
@ -113,7 +124,7 @@ bool DesktopCapturer::OnRefreshFinished() {
for (int i = 0; i < media_list_->GetSourceCount(); ++i)
sources.push_back(media_list_->GetSource(i));
media_list_.reset();
Emit("refresh-finished", sources);
Emit("handling-finished", "", sources);
return false;
}

9
atom/browser/lib/desktop-capturer.coffee
View file

@ -11,25 +11,26 @@ requestsQueue = []
ipc.on 'ATOM_BROWSER_DESKTOP_CAPTURER_GET_SOURCES', (event, options) ->
request = { options: options, webContents: event.sender }
desktopCapturer.startHandling options if requestsQueue.length is 0
requestsQueue.push request
desktopCapturer.startHandling options if requestsQueue.length is 1
# If the WebContents is destroyed before receiving result, just remove the
# reference from requestsQueue to make the module not send the result to it.
event.sender.once 'destroyed', () ->
request.webContents = null
desktopCapturer.emit = (event_name, event, sources) ->
desktopCapturer.emit = (event_name, event, error_message, sources) ->
# Receiving sources result from main process, now send them back to renderer.
handledRequest = requestsQueue.shift 0
error = if error_message then Error error_message else null
result = ({ id: source.id, name: source.name, thumbnail: source.thumbnail.toDataUrl() } for source in sources)
handledRequest.webContents?.send 'ATOM_RENDERER_DESKTOP_CAPTURER_RESULT', result
handledRequest.webContents?.send 'ATOM_RENDERER_DESKTOP_CAPTURER_RESULT', error_message, result
# Check the queue to see whether there is other same request. If has, handle
# it for reducing redunplicated `desktopCaptuer.startHandling` calls.
unhandledRequestsQueue = []
for request in requestsQueue
if isOptionsEqual handledRequest.options, request.options
request.webContents?.send 'ATOM_RENDERER_DESKTOP_CAPTURER_RESULT', result
request.webContents?.send 'ATOM_RENDERER_DESKTOP_CAPTURER_RESULT', error_message, result
else
unhandledRequestsQueue.push request
requestsQueue = unhandledRequestsQueue