Bug 993190 - Use the outline highlighter on fennec. r=miker, a=sledru
authorPatrick Brosset <pbrosset@mozilla.com>
Wed, 16 Apr 2014 11:37:24 +0200
changeset 183789 ddbb75065940
parent 183788 85e9ba2c9371
child 183790 bd52a0b3dc58
push id3484
push userryanvm@gmail.com
push date2014-04-17 14:27 +0000
treeherdermozilla-beta@5f78c1ba85e3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmiker, sledru
bugs993190
milestone29.0
Bug 993190 - Use the outline highlighter on fennec. r=miker, a=sledru
toolkit/devtools/server/actors/highlighter.js
--- a/toolkit/devtools/server/actors/highlighter.js
+++ b/toolkit/devtools/server/actors/highlighter.js
@@ -52,17 +52,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.destroy();
       this._boxModelHighlighter = null;
     }