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

Remove deprecated API usages

Browse source
This commit is contained in:
Cheng Zhao 2015-12-08 12:58:39 +08:00
parent 785bc2986b
commit 51368952a2
4 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,15 +1,13 @@
ipc = require 'ipc' {ipcMain} = require 'electron'
{desktopCapturer} = process.atomBinding 'desktop_capturer'
# The browser module manages all desktop-capturer moduels in renderer process. deepEqual = (opt1, opt2) ->
desktopCapturer = process.atomBinding('desktop_capturer').desktopCapturer
isOptionsEqual = (opt1, opt2) ->
return JSON.stringify(opt1) is JSON.stringify(opt2) return JSON.stringify(opt1) is JSON.stringify(opt2)
# A queue for holding all requests from renderer process. # A queue for holding all requests from renderer process.
requestsQueue = [] requestsQueue = []
ipc.on 'ATOM_BROWSER_DESKTOP_CAPTURER_GET_SOURCES', (event, options, id) -> ipcMain.on 'ATOM_BROWSER_DESKTOP_CAPTURER_GET_SOURCES', (event, options, id) ->
request = { id: id, options: options, webContents: event.sender } request = { id: id, options: options, webContents: event.sender }
requestsQueue.push request requestsQueue.push request
desktopCapturer.startHandling options if requestsQueue.length is 1 desktopCapturer.startHandling options if requestsQueue.length is 1
@ -29,7 +27,7 @@ desktopCapturer.emit = (event_name, event, error_message, sources) ->
# it for reducing redunplicated `desktopCaptuer.startHandling` calls. # it for reducing redunplicated `desktopCaptuer.startHandling` calls.
unhandledRequestsQueue = [] unhandledRequestsQueue = []
for request in requestsQueue for request in requestsQueue
if isOptionsEqual handledRequest.options, request.options if deepEqual handledRequest.options, request.options
request.webContents?.send "ATOM_RENDERER_DESKTOP_CAPTURER_RESULT_#{request.id}", error_message, result request.webContents?.send "ATOM_RENDERER_DESKTOP_CAPTURER_RESULT_#{request.id}", error_message, result
else else
unhandledRequestsQueue.push request unhandledRequestsQueue.push request

12
atom/renderer/api/lib/desktop-capturer.coffee
View file

@ -1,15 +1,11 @@
ipc = require 'ipc' {ipcRenderer, NativeImage} = require 'electron'
NativeImage = require 'native-image'
nextId = 0 nextId = 0
getNextId = -> ++nextId getNextId = -> ++nextId
getSources = (options, callback) -> exports.getSources = (options, callback) ->
id = getNextId() id = getNextId()
ipc.send 'ATOM_BROWSER_DESKTOP_CAPTURER_GET_SOURCES', options, id ipcRenderer.send 'ATOM_BROWSER_DESKTOP_CAPTURER_GET_SOURCES', options, id
ipc.once "ATOM_RENDERER_DESKTOP_CAPTURER_RESULT_#{id}", (error_message, sources) -> ipcRenderer.once "ATOM_RENDERER_DESKTOP_CAPTURER_RESULT_#{id}", (error_message, sources) ->
error = if error_message then Error error_message else null error = if error_message then Error error_message else null
callback error, ({id: source.id, name: source.name, thumbnail: NativeImage.createFromDataUrl source.thumbnail} for source in sources) callback error, ({id: source.id, name: source.name, thumbnail: NativeImage.createFromDataUrl source.thumbnail} for source in sources)
module.exports =
getSources: getSources

1
chromium_src/chrome/browser/media/desktop_media_list.h
View file

@ -6,6 +6,7 @@
#define CHROME_BROWSER_MEDIA_DESKTOP_MEDIA_LIST_H_ #define CHROME_BROWSER_MEDIA_DESKTOP_MEDIA_LIST_H_
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/strings/string16.h"
#include "base/time/time.h" #include "base/time/time.h"
#include "content/public/browser/desktop_media_id.h" #include "content/public/browser/desktop_media_id.h"
#include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia.h"

1
chromium_src/chrome/browser/media/native_desktop_media_list.cc
View file

@ -10,6 +10,7 @@
#include "base/hash.h" #include "base/hash.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "base/threading/sequenced_worker_pool.h" #include "base/threading/sequenced_worker_pool.h"
#include "chrome/browser/media/desktop_media_list_observer.h" #include "chrome/browser/media/desktop_media_list_observer.h"