Add "enable_desktop_capturer" build flag (#13133)

* Make it possible to disable a module for a renderer

* Put DesktopCapturer API under a build flag

The name is "enable_desktop_capturer".
Enabled by default.

BUILD.gn

@@ -24,6 +24,7 @@ declare_args() {
   electron_company_abbr = "github"
   electron_version = "0.0.0-dev"
 
+  enable_desktop_capturer = true
   enable_run_as_node = true
   enable_osr = true
 }
@@ -47,6 +48,9 @@ config("branding") {
 
 config("features") {
   defines = []
+  if (enable_desktop_capturer) {
+    defines += [ "ENABLE_DESKTOP_CAPTURER=1" ]
+  }
   if (enable_run_as_node) {
     defines += [ "ENABLE_RUN_AS_NODE=1" ]
   }

atom/common/api/features.cc

@@ -7,6 +7,14 @@
 
 namespace {
 
+bool IsDesktopCapturerEnabled() {
+#if defined(ENABLE_DESKTOP_CAPTURER)
+  return true;
+#else
+  return false;
+#endif
+}
+
 bool IsOffscreenRenderingEnabled() {
 #if defined(ENABLE_OSR)
   return true;
@@ -28,6 +36,7 @@ void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Context> context,
                 void* priv) {
   mate::Dictionary dict(context->GetIsolate(), exports);
+  dict.SetMethod("isDesktopCapturerEnabled", &IsDesktopCapturerEnabled);
   dict.SetMethod("isOffscreenRenderingEnabled", &IsOffscreenRenderingEnabled);
   dict.SetMethod("isPDFViewerEnabled", &IsPDFViewerEnabled);
 }

atom/common/node_bindings.cc

@@ -33,7 +33,6 @@
   V(atom_browser_browser_view)               \
   V(atom_browser_content_tracing)            \
   V(atom_browser_debugger)                   \
-  V(atom_browser_desktop_capturer)           \
   V(atom_browser_dialog)                     \
   V(atom_browser_download_item)              \
   V(atom_browser_global_shortcut)            \
@@ -69,6 +68,8 @@
   V(atom_browser_box_layout)     \
   V(atom_browser_layout_manager)
 
+#define ELECTRON_DESKTOP_CAPTURER_MODULE(V) V(atom_browser_desktop_capturer)
+
 // This is used to load built-in modules. Instead of using
 // __attribute__((constructor)), we call the _register_<modname>
 // function for each built-in modules explicitly. This is only
@@ -79,6 +80,9 @@ ELECTRON_BUILTIN_MODULES(V)
 #if defined(ENABLE_VIEW_API)
 ELECTRON_VIEW_MODULES(V)
 #endif
+#if defined(ENABLE_DESKTOP_CAPTURER)
+ELECTRON_DESKTOP_CAPTURER_MODULE(V)
+#endif
 #undef V
 
 namespace {
@@ -177,6 +181,9 @@ void NodeBindings::RegisterBuiltinModules() {
 #if defined(ENABLE_VIEW_API)
   ELECTRON_VIEW_MODULES(V)
 #endif
+#if defined(ENABLE_DESKTOP_CAPTURER)
+  ELECTRON_DESKTOP_CAPTURER_MODULE(V)
+#endif
 #undef V
 }
 

electron.gyp

@@ -23,6 +23,11 @@
           '<(source_root)/external_binaries',
         ],
       }],
+      ['enable_desktop_capturer==1', {
+        'defines': [
+          'ENABLE_DESKTOP_CAPTURER',
+        ],
+      }],  # enable_desktop_capturer==1
       ['enable_osr==1', {
         'defines': [
           'ENABLE_OSR',

features.gypi

@@ -2,11 +2,13 @@
   # If it looks stupid but it works it ain't stupid.
   'variables': {
     'variables': {
+      'enable_desktop_capturer%': 1,
       'enable_osr%': 1,  # FIXME(alexeykuzmin)
       'enable_pdf_viewer%': 0,  # FIXME(deepak1556)
       'enable_run_as_node%': 1,
       'enable_view_api%': 0,
     },
+    'enable_desktop_capturer%': '<(enable_desktop_capturer)',
     'enable_osr%': '<(enable_osr)',
     'enable_pdf_viewer%': '<(enable_pdf_viewer)',
     'enable_run_as_node%': '<(enable_run_as_node)',

filenames.gypi

@@ -42,7 +42,6 @@
       'lib/browser/api/web-contents.js',
       'lib/browser/api/web-contents-view.js',
       'lib/browser/chrome-extension.js',
-      'lib/browser/desktop-capturer.js',
       'lib/browser/guest-view-manager.js',
       'lib/browser/guest-window-manager.js',
       'lib/browser/init.js',
@@ -75,7 +74,6 @@
       'lib/renderer/web-view/web-view.js',
       'lib/renderer/web-view/web-view-attributes.js',
       'lib/renderer/web-view/web-view-constants.js',
-      'lib/renderer/api/desktop-capturer.js',
       'lib/renderer/api/exports/electron.js',
       'lib/renderer/api/ipc-renderer.js',
       'lib/renderer/api/module-list.js',
@@ -121,8 +119,6 @@
       'atom/browser/api/atom_api_cookies.h',
       'atom/browser/api/atom_api_debugger.cc',
       'atom/browser/api/atom_api_debugger.h',
-      'atom/browser/api/atom_api_desktop_capturer.cc',
-      'atom/browser/api/atom_api_desktop_capturer.h',
       'atom/browser/api/atom_api_dialog.cc',
       'atom/browser/api/atom_api_download_item.cc',
       'atom/browser/api/atom_api_download_item.h',
@@ -742,6 +738,16 @@
           '<(libchromiumcontent_src_dir)/ui/resources/cursors/zoom_out.cur',
         ],
       }],  # OS=="win"
+      ['enable_desktop_capturer==1', {
+        'js_sources': [
+          'lib/browser/desktop-capturer.js',
+          'lib/renderer/api/desktop-capturer.js',
+        ],
+        'lib_sources': [
+          'atom/browser/api/atom_api_desktop_capturer.cc',
+          'atom/browser/api/atom_api_desktop_capturer.h',
+        ],
+      }],  # enable_desktop_capturer
       ['enable_osr==1', {
         'lib_sources': [
           'atom/browser/api/atom_api_web_contents_osr.cc',

lib/browser/init.js

@@ -153,8 +153,11 @@ app.setAppPath(packagePath)
 // Load the chrome extension support.
 require('./chrome-extension')
 
-// Load internal desktop-capturer module.
+const features = process.atomBinding('features')
-require('./desktop-capturer')
+if (features.isDesktopCapturerEnabled()) {
+  // Load internal desktop-capturer module.
+  require('./desktop-capturer')
+}
 
 // Load protocol module to ensure it is populated on app ready
 require('./api/protocol')

lib/renderer/api/exports/electron.js

@@ -4,9 +4,18 @@ const moduleList = require('../module-list')
 // Import common modules.
 common.defineProperties(exports)
 
-for (const module of moduleList) {
+for (const {
-  Object.defineProperty(exports, module.name, {
+        name,
-    enumerable: !module.private,
+        file,
-    get: () => require(`../${module.file}`)
+        enabled = true,
+        private: isPrivate = false
+    } of moduleList) {
+  if (!enabled) {
+    continue
+  }
+
+  Object.defineProperty(exports, name, {
+    enumerable: !isPrivate,
+    get: () => require(`../${file}`)
   })
 }

lib/renderer/api/module-list.js

@@ -1,8 +1,15 @@
+const features = process.atomBinding('features')
+
 // Renderer side modules, please sort alphabetically.
+// A module is `enabled` if there is no explicit condition defined.
 module.exports = [
-  {name: 'desktopCapturer', file: 'desktop-capturer'},
+  {
-  {name: 'ipcRenderer', file: 'ipc-renderer'},
+    name: 'desktopCapturer',
-  {name: 'remote', file: 'remote'},
+    file: 'desktop-capturer',
-  {name: 'screen', file: 'screen'},
+    enabled: features.isDesktopCapturerEnabled()
-  {name: 'webFrame', file: 'web-frame'}
+  },
+  {name: 'ipcRenderer', file: 'ipc-renderer', enabled: true},
+  {name: 'remote', file: 'remote', enabled: true},
+  {name: 'screen', file: 'screen', enabled: true},
+  {name: 'webFrame', file: 'web-frame', enabled: true}
 ]

lib/sandboxed_renderer/api/exports/electron.js

@@ -33,6 +33,8 @@ Object.defineProperties(exports, {
       return require('../../../common/api/is-promise')
     }
   },
+  // XXX(alexeykuzmin): It won't be available if the Desktop Capturer
+  // was disabled during build time.
   desktopCapturer: {
     get: function () {
       return require('../../../renderer/api/desktop-capturer')

spec/api-desktop-capturer-spec.js

@@ -1,10 +1,17 @@
 const assert = require('assert')
 const {desktopCapturer, remote, screen} = require('electron')
+const features = process.atomBinding('features')
 
 const isCI = remote.getGlobal('isCi')
 
 describe('desktopCapturer', () => {
   before(function () {
+    if (!features.isDesktopCapturerEnabled()) {
+      // It's been disabled during build time.
+      this.skip()
+      return
+    }
+
     if (isCI && process.platform === 'win32') {
       this.skip()
     }