first pass at standardizing; suite still passing!
This commit is contained in:
parent
f25c3d33b6
commit
4794385fac
30 changed files with 1454 additions and 1462 deletions
|
@ -1,17 +1,17 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
const ipcMain = require('electron').ipcMain;
|
||||
const desktopCapturer = process.atomBinding('desktop_capturer').desktopCapturer;
|
||||
const ipcMain = require('electron').ipcMain
|
||||
const desktopCapturer = process.atomBinding('desktop_capturer').desktopCapturer
|
||||
|
||||
var deepEqual = function(opt1, opt2) {
|
||||
return JSON.stringify(opt1) === JSON.stringify(opt2);
|
||||
};
|
||||
var deepEqual = function (opt1, opt2) {
|
||||
return JSON.stringify(opt1) === JSON.stringify(opt2)
|
||||
}
|
||||
|
||||
// A queue for holding all requests from renderer process.
|
||||
var requestsQueue = [];
|
||||
var requestsQueue = []
|
||||
|
||||
ipcMain.on('ATOM_BROWSER_DESKTOP_CAPTURER_GET_SOURCES', function(event, captureWindow, captureScreen, thumbnailSize, id) {
|
||||
var request;
|
||||
ipcMain.on('ATOM_BROWSER_DESKTOP_CAPTURER_GET_SOURCES', function (event, captureWindow, captureScreen, thumbnailSize, id) {
|
||||
var request
|
||||
request = {
|
||||
id: id,
|
||||
options: {
|
||||
|
@ -20,58 +20,58 @@ ipcMain.on('ATOM_BROWSER_DESKTOP_CAPTURER_GET_SOURCES', function(event, captureW
|
|||
thumbnailSize: thumbnailSize
|
||||
},
|
||||
webContents: event.sender
|
||||
};
|
||||
requestsQueue.push(request);
|
||||
}
|
||||
requestsQueue.push(request)
|
||||
if (requestsQueue.length === 1) {
|
||||
desktopCapturer.startHandling(captureWindow, captureScreen, thumbnailSize);
|
||||
desktopCapturer.startHandling(captureWindow, captureScreen, thumbnailSize)
|
||||
}
|
||||
|
||||
// If the WebContents is destroyed before receiving result, just remove the
|
||||
// reference from requestsQueue to make the module not send the result to it.
|
||||
return event.sender.once('destroyed', function() {
|
||||
return request.webContents = null;
|
||||
});
|
||||
});
|
||||
return event.sender.once('destroyed', function () {
|
||||
return request.webContents = null
|
||||
})
|
||||
})
|
||||
|
||||
desktopCapturer.emit = function(event, name, sources) {
|
||||
desktopCapturer.emit = function (event, name, sources) {
|
||||
// Receiving sources result from main process, now send them back to renderer.
|
||||
var handledRequest, i, len, ref, ref1, request, result, source, unhandledRequestsQueue;
|
||||
handledRequest = requestsQueue.shift(0);
|
||||
result = (function() {
|
||||
var i, len, results;
|
||||
results = [];
|
||||
var handledRequest, i, len, ref, ref1, request, result, source, unhandledRequestsQueue
|
||||
handledRequest = requestsQueue.shift(0)
|
||||
result = (function () {
|
||||
var i, len, results
|
||||
results = []
|
||||
for (i = 0, len = sources.length; i < len; i++) {
|
||||
source = sources[i];
|
||||
source = sources[i]
|
||||
results.push({
|
||||
id: source.id,
|
||||
name: source.name,
|
||||
thumbnail: source.thumbnail.toDataUrl()
|
||||
});
|
||||
})
|
||||
}
|
||||
return results;
|
||||
})();
|
||||
return results
|
||||
})()
|
||||
if ((ref = handledRequest.webContents) != null) {
|
||||
ref.send("ATOM_RENDERER_DESKTOP_CAPTURER_RESULT_" + handledRequest.id, result);
|
||||
ref.send('ATOM_RENDERER_DESKTOP_CAPTURER_RESULT_' + handledRequest.id, result)
|
||||
}
|
||||
|
||||
// Check the queue to see whether there is other same request. If has, handle
|
||||
// it for reducing redunplicated `desktopCaptuer.startHandling` calls.
|
||||
unhandledRequestsQueue = [];
|
||||
unhandledRequestsQueue = []
|
||||
for (i = 0, len = requestsQueue.length; i < len; i++) {
|
||||
request = requestsQueue[i];
|
||||
request = requestsQueue[i]
|
||||
if (deepEqual(handledRequest.options, request.options)) {
|
||||
if ((ref1 = request.webContents) != null) {
|
||||
ref1.send("ATOM_RENDERER_DESKTOP_CAPTURER_RESULT_" + request.id, result);
|
||||
ref1.send('ATOM_RENDERER_DESKTOP_CAPTURER_RESULT_' + request.id, result)
|
||||
}
|
||||
} else {
|
||||
unhandledRequestsQueue.push(request);
|
||||
unhandledRequestsQueue.push(request)
|
||||
}
|
||||
}
|
||||
requestsQueue = unhandledRequestsQueue;
|
||||
requestsQueue = unhandledRequestsQueue
|
||||
|
||||
// If the requestsQueue is not empty, start a new request handling.
|
||||
if (requestsQueue.length > 0) {
|
||||
const {captureWindow, captureScreen, thumbnailSize} = requestsQueue[0].options;
|
||||
return desktopCapturer.startHandling(captureWindow, captureScreen, thumbnailSize);
|
||||
const {captureWindow, captureScreen, thumbnailSize} = requestsQueue[0].options
|
||||
return desktopCapturer.startHandling(captureWindow, captureScreen, thumbnailSize)
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue