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 192904 770e11b422e38c8c7f4cbef78d1cf5755db87054
parent 192903 c1edb0b6d436825952e37d122bdf1cd9b9b5253c
child 192905 e40ad1c2d329b4c2f849e818756e8600d649bf5b
push id474
push userasasaki@mozilla.com
push dateMon, 02 Jun 2014 21:01:02 +0000
treeherdermozilla-release@967f4cf1b31c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmiker, sledru
bugs993190
milestone30.0a2
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
@@ -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();