Bug 1508656- migrate togglePicker to nodePicker; r=ochameau
authoryulia <ystartsev@mozilla.com>
Tue, 18 Dec 2018 08:46:18 +0000
changeset 509355 a20625c5026f87156401153a08a285f4d4ea31ae
parent 509354 cb8e0fb71422c6f670ce8ae756bf276b5e22a6a7
child 509356 d78f0458b4d92593467b0e0060b63818d07ab94c
push id10547
push userffxbld-merge
push dateMon, 21 Jan 2019 13:03:58 +0000
treeherdermozilla-beta@24ec1916bffe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersochameau
bugs1508656
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1508656- migrate togglePicker to nodePicker; r=ochameau Depends on D12119 Differential Revision: https://phabricator.services.mozilla.com/D12122
devtools/client/definitions.js
devtools/client/framework/toolbox.js
devtools/client/inspector/animation/animation.js
--- a/devtools/client/definitions.js
+++ b/devtools/client/definitions.js
@@ -80,17 +80,17 @@ Tools.inspector = {
     }
 
     return l10n("inspector.tooltip2", "Ctrl+Shift+") + l10n("inspector.commandkey");
   },
   inMenu: true,
 
   preventClosingOnKey: true,
   onkey: function(panel, toolbox) {
-    toolbox.highlighterUtils.togglePicker();
+    toolbox.inspector.nodePicker.togglePicker();
   },
 
   isTargetSupported: function(target) {
     return target.hasActor("inspector");
   },
 
   build: function(iframeWindow, toolbox) {
     return new InspectorPanel(iframeWindow, toolbox);
--- a/devtools/client/framework/toolbox.js
+++ b/devtools/client/framework/toolbox.js
@@ -1275,17 +1275,17 @@ Toolbox.prototype = {
   _onPickerClick: function() {
     const focus = this.hostType === Toolbox.HostType.BOTTOM ||
                   this.hostType === Toolbox.HostType.LEFT ||
                   this.hostType === Toolbox.HostType.RIGHT;
     const currentPanel = this.getCurrentPanel();
     if (currentPanel.togglePicker) {
       currentPanel.togglePicker(focus);
     } else {
-      this.highlighterUtils.togglePicker(focus);
+      this.inspector.nodePicker.togglePicker(focus);
     }
   },
 
   /**
    * If the picker is activated, then allow the Escape key to deactivate the
    * functionality instead of the default behavior of toggling the console.
    */
   _onPickerKeypress: function(event) {
--- a/devtools/client/inspector/animation/animation.js
+++ b/devtools/client/inspector/animation/animation.js
@@ -647,17 +647,17 @@ class AnimationInspector {
     const currentTimeTimer =
       new CurrentTimeTimer(timeScale, shouldStopAfterEndTime,
                            this.win, this.onCurrentTimeTimerUpdated);
     currentTimeTimer.start();
     this.currentTimeTimer = currentTimeTimer;
   }
 
   toggleElementPicker() {
-    this.inspector.toolbox.highlighterUtils.togglePicker();
+    this.inspector.inspector.nodePicker.togglePicker();
   }
 
   async update() {
     const done = this.inspector.updating("animationinspector");
 
     const selection = this.inspector.selection;
     const animationsFront = await this.animationsFrontPromise;
     const animations =