| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * This file is part of Adblock Plus <https://adblockplus.org/>, | 2  * This file is part of Adblock Plus <https://adblockplus.org/>, | 
| 3  * Copyright (C) 2006-present eyeo GmbH | 3  * Copyright (C) 2006-present eyeo GmbH | 
| 4  * | 4  * | 
| 5  * Adblock Plus is free software: you can redistribute it and/or modify | 5  * Adblock Plus is free software: you can redistribute it and/or modify | 
| 6  * it under the terms of the GNU General Public License version 3 as | 6  * it under the terms of the GNU General Public License version 3 as | 
| 7  * published by the Free Software Foundation. | 7  * published by the Free Software Foundation. | 
| 8  * | 8  * | 
| 9  * Adblock Plus is distributed in the hope that it will be useful, | 9  * Adblock Plus is distributed in the hope that it will be useful, | 
| 10  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| (...skipping 16 matching lines...) Expand all  Loading... | 
| 27 // The Chromium version is a build number, quite obscure. | 27 // The Chromium version is a build number, quite obscure. | 
| 28 // Chromium 63.0.3239.x is 508578 | 28 // Chromium 63.0.3239.x is 508578 | 
| 29 // Chromium 65.0.3325.0 is 530368 | 29 // Chromium 65.0.3325.0 is 530368 | 
| 30 // We currently want Chromiun 63, as we still support it and that's the | 30 // We currently want Chromiun 63, as we still support it and that's the | 
| 31 // loweset version that supports WebDriver. | 31 // loweset version that supports WebDriver. | 
| 32 const CHROMIUM_REVISION = 508578; | 32 const CHROMIUM_REVISION = 508578; | 
| 33 | 33 | 
| 34 function runScript(chromiumPath, script, scriptName, scriptArgs) | 34 function runScript(chromiumPath, script, scriptName, scriptArgs) | 
| 35 { | 35 { | 
| 36   const options = new chrome.Options() | 36   const options = new chrome.Options() | 
| 37         .headless() |  | 
| 38         // Disabling sandboxing is needed on some system configurations | 37         // Disabling sandboxing is needed on some system configurations | 
| 39         // like Debian 9. | 38         // like Debian 9. | 
| 40         .addArguments("--no-sandbox") | 39         .addArguments("--no-sandbox") | 
| 41         .setChromeBinaryPath(chromiumPath); | 40         .setChromeBinaryPath(chromiumPath); | 
|  | 41   // Headless doesn't seem to work on Windows. | 
|  | 42   if (process.platform != "win32") | 
|  | 43     options.headless(); | 
| 42 | 44 | 
| 43   const driver = new Builder() | 45   const driver = new Builder() | 
| 44         .forBrowser("chrome") | 46         .forBrowser("chrome") | 
| 45         .setChromeOptions(options) | 47         .setChromeOptions(options) | 
| 46         .build(); | 48         .build(); | 
| 47 | 49 | 
| 48   return executeScript(driver, "Chromium (WebDriver)", | 50   return executeScript(driver, "Chromium (WebDriver)", | 
| 49                        script, scriptName, scriptArgs); | 51                        script, scriptName, scriptArgs); | 
| 50 } | 52 } | 
| 51 | 53 | 
| 52 module.exports = function(script, scriptName, ...scriptArgs) | 54 module.exports = function(script, scriptName, ...scriptArgs) | 
| 53 { | 55 { | 
| 54   return ensureChromium(CHROMIUM_REVISION) | 56   return ensureChromium(CHROMIUM_REVISION) | 
| 55     .then(chromiumPath => runScript(chromiumPath, script, scriptName, scriptArgs
    )); | 57     .then(chromiumPath => runScript(chromiumPath, script, scriptName, scriptArgs
    )); | 
| 56 }; | 58 }; | 
| OLD | NEW | 
|---|