diff options
Diffstat (limited to 'devtools')
| -rw-r--r-- | devtools/client/scratchpad/scratchpad.xul | 2 | ||||
| -rw-r--r-- | devtools/client/shared/curl.js | 8 | ||||
| -rw-r--r-- | devtools/moz.build | 8 | ||||
| -rw-r--r-- | devtools/server/actors/moz.build | 5 | ||||
| -rw-r--r-- | devtools/server/actors/webbrowser.js | 4 |
5 files changed, 18 insertions, 9 deletions
diff --git a/devtools/client/scratchpad/scratchpad.xul b/devtools/client/scratchpad/scratchpad.xul index 0603fa95e..3712f163d 100644 --- a/devtools/client/scratchpad/scratchpad.xul +++ b/devtools/client/scratchpad/scratchpad.xul @@ -121,7 +121,7 @@ <key id="sp-key-reloadAndRun" key="&reloadAndRun.key;" command="sp-cmd-reloadAndRun" - modifiers="accel,shift"/> + modifiers="accel,alt"/> <key id="sp-key-evalFunction" key="&evalFunction.key;" command="sp-cmd-evalFunction" diff --git a/devtools/client/shared/curl.js b/devtools/client/shared/curl.js index 978cbad9c..44465193f 100644 --- a/devtools/client/shared/curl.js +++ b/devtools/client/shared/curl.js @@ -107,7 +107,13 @@ const Curl = { // Add http version. if (data.httpVersion && data.httpVersion != DEFAULT_HTTP_VERSION) { - command.push("--" + data.httpVersion.split("/")[1]); + let version = data.httpVersion.split("/")[1]; + // curl accepts --http1.0, --http1.1 and --http2 for HTTP/1.0, HTTP/1.1 + // and HTTP/2 protocols respectively. But the corresponding values in + // data.httpVersion are HTTP/1.0, HTTP/1.1 and HTTP/2.0 + // So in case of HTTP/2.0 (which should ideally be HTTP/2) we are using + // only major version, and full version in other cases + command.push("--http" + (version == "2.0" ? version.split(".")[0] : version)); } // Add request headers. diff --git a/devtools/moz.build b/devtools/moz.build index 79787d019..8e368facb 100644 --- a/devtools/moz.build +++ b/devtools/moz.build @@ -4,13 +4,9 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -if CONFIG['MOZ_DEVTOOLS'] and CONFIG['MOZ_DEVTOOLS'] not in ('all', 'server'): - error('Unsupported MOZ_DEVTOOLS value: %s' % (CONFIG['MOZ_DEVTOOLS'])) +if CONFIG['MOZ_DEVTOOLS']: + DIRS += ['client'] -if CONFIG['MOZ_DEVTOOLS'] == 'all': - DIRS += [ - 'client', - ] DIRS += [ 'server', diff --git a/devtools/server/actors/moz.build b/devtools/server/actors/moz.build index 5980876e2..ddefc3e9e 100644 --- a/devtools/server/actors/moz.build +++ b/devtools/server/actors/moz.build @@ -61,9 +61,12 @@ DevToolsModules( 'stylesheets.js', 'timeline.js', 'webaudio.js', - 'webbrowser.js', 'webconsole.js', 'webextension.js', 'webgl.js', 'worker.js', ) + +FINAL_TARGET_PP_FILES.chrome.devtools.modules.devtools.server.actors += [ + 'webbrowser.js', +]
\ No newline at end of file diff --git a/devtools/server/actors/webbrowser.js b/devtools/server/actors/webbrowser.js index 0edcdc187..1808895b1 100644 --- a/devtools/server/actors/webbrowser.js +++ b/devtools/server/actors/webbrowser.js @@ -30,7 +30,9 @@ loader.lazyRequireGetter(this, "WorkerActorList", "devtools/server/actors/worker loader.lazyRequireGetter(this, "ServiceWorkerRegistrationActorList", "devtools/server/actors/worker", true); loader.lazyRequireGetter(this, "ProcessActorList", "devtools/server/actors/process", true); loader.lazyImporter(this, "AddonManager", "resource://gre/modules/AddonManager.jsm"); +#ifdef MOZ_WEBEXTENSIONS loader.lazyImporter(this, "ExtensionContent", "resource://gre/modules/ExtensionContent.jsm"); +#endif // Assumptions on events module: // events needs to be dispatched synchronously, @@ -982,6 +984,7 @@ TabActor.prototype = { return null; }, +#ifdef MOZ_WEBEXTENSIONS /** * Getter for the WebExtensions ContentScript globals related to the * current tab content's DOM window. @@ -994,6 +997,7 @@ TabActor.prototype = { return []; }, +#endif /** * Getter for the list of all content DOM windows in this tabActor |