Bug 993190 - Use the outline highlighter on fennec; r=miker
authorPatrick Brosset <pbrosset@mozilla.com>
Wed, 16 Apr 2014 11:37:24 +0200
changeset 197395 8e92a7640d74738496f421c260647ee0636f8103
parent 197284 dc87f47062ce7736bebfe059279517370db47d7d
child 197396 35603c406f26ccf7e70c75e26e7733a1f7f0d3c6
push id3624
push userasasaki@mozilla.com
push dateMon, 09 Jun 2014 21:49:01 +0000
treeherdermozilla-beta@b1a5da15899a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmiker
bugs993190
milestone31.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 993190 - Use the outline highlighter on fennec; r=miker
toolkit/devtools/server/actors/highlighter.js
--- a/toolkit/devtools/server/actors/highlighter.js
+++ b/toolkit/devtools/server/actors/highlighter.js
@@ -66,17 +66,21 @@ let HighlighterActor = protocol.ActorCla
 
   get conn() this._inspector && this._inspector.conn,
 
   /**
    * Can the host support the box model highlighter which requires a parent
    * XUL node to attach itself.
    */
   _supportsBoxModelHighlighter: function() {
-    return this._tabActor.browser && !!this._tabActor.browser.parentNode;
+    // Note that <browser>s on Fennec also have a XUL parentNode but the box
+    // model highlighter doesn't display correctly on Fennec (bug 993190)
+    return this._tabActor.browser &&
+           !!this._tabActor.browser.parentNode &&
+           Services.appinfo.ID !== "{aa3c5121-dab2-40e2-81ca-7ea25febc110}";
   },
 
   destroy: function() {
     protocol.Actor.prototype.destroy.call(this);
     if (this._boxModelHighlighter) {
       this._boxModelHighlighter.off("ready", this._highlighterReady);
       this._boxModelHighlighter.off("hide", this._highlighterHidden);
       this._boxModelHighlighter.destroy();