From d1025c9eea2fa3ebdd4788c492bfd27cfb174475 Mon Sep 17 00:00:00 2001
From: Julian Descottes <jdescottes@mozilla.com>
Date: Fri, 8 Jul 2016 15:46:42 +0200
Subject: [PATCH] Bug 1285206 - Enable xul panel for some devtools
 tooltips;r=bgrins

Set useXulWrapper to true for markup view image previews and rule view
tooltips.

Also slightly changed the logic in HTMLTooltip.js so that useXulWrapper is only
true when we are in a XUL context.

MozReview-Commit-ID: 9EkQYLLAn7C

--HG--
extra : rebase_source : 5b096345c087a85f3c66fdca639287196e22775c
---
 devtools/client/inspector/markup/markup.js                   | 2 +-
 devtools/client/inspector/shared/style-inspector-overlays.js | 3 ++-
 devtools/client/shared/widgets/HTMLTooltip.js                | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/devtools/client/inspector/markup/markup.js b/devtools/client/inspector/markup/markup.js
index f4fa06200b61..a6201648ebd2 100644
--- a/devtools/client/inspector/markup/markup.js
+++ b/devtools/client/inspector/markup/markup.js
@@ -172,7 +172,7 @@ MarkupView.prototype = {
     this.eventDetailsTooltip = new HTMLTooltip(this._inspector.toolbox,
       {type: "arrow"});
     this.imagePreviewTooltip = new HTMLTooltip(this._inspector.toolbox,
-      {type: "arrow"});
+      {type: "arrow", useXulWrapper: "true"});
     this._enableImagePreviewTooltip();
   },
 
diff --git a/devtools/client/inspector/shared/style-inspector-overlays.js b/devtools/client/inspector/shared/style-inspector-overlays.js
index e0bb5d0dc290..c1c59bcbc7ff 100644
--- a/devtools/client/inspector/shared/style-inspector-overlays.js
+++ b/devtools/client/inspector/shared/style-inspector-overlays.js
@@ -280,7 +280,8 @@ TooltipsOverlay.prototype = {
 
     // Image, fonts, ... preview tooltip
     this.previewTooltip = new HTMLTooltip(this.view.inspector.toolbox, {
-      type: "arrow"
+      type: "arrow",
+      useXulWrapper: true
     });
     this.previewTooltip.startTogglingOnHover(this.view.element,
       this._onPreviewTooltipTargetHover.bind(this));
diff --git a/devtools/client/shared/widgets/HTMLTooltip.js b/devtools/client/shared/widgets/HTMLTooltip.js
index ef43c8610942..a01db9f555fa 100644
--- a/devtools/client/shared/widgets/HTMLTooltip.js
+++ b/devtools/client/shared/widgets/HTMLTooltip.js
@@ -211,7 +211,7 @@ function HTMLTooltip(toolbox, {
   this.type = type;
   this.autofocus = autofocus;
   this.consumeOutsideClicks = consumeOutsideClicks;
-  this.useXulWrapper = useXulWrapper;
+  this.useXulWrapper = this._isXUL() && useXulWrapper;
 
   this._position = null;
 
@@ -229,7 +229,7 @@ function HTMLTooltip(toolbox, {
   if (stylesheet) {
     this._applyStylesheet(stylesheet);
   }
-  if (this._isXUL() && this.useXulWrapper) {
+  if (this.useXulWrapper) {
     // When using a XUL panel as the wrapper, the actual markup for the tooltip is as
     // follows :
     // <panel> <!-- XUL panel used to position the tooltip anywhere on screen -->