From e4d3bb3440ae697e32402a0f1545a593ed0b4d98 Mon Sep 17 00:00:00 2001
From: Alexandre Poirot <poirot.alex@gmail.com>
Date: Mon, 14 Sep 2015 02:47:13 -0700
Subject: [PATCH] bug 1145049 - Fix nodepicker when reopening toolbox for the
 same app. r=pbrosset

---
 toolkit/devtools/server/actors/inspector.js | 8 +++++++-
 toolkit/devtools/server/actors/styles.js    | 4 +++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/toolkit/devtools/server/actors/inspector.js b/toolkit/devtools/server/actors/inspector.js
index ed484a87e9d4..2aed1c942886 100644
--- a/toolkit/devtools/server/actors/inspector.js
+++ b/toolkit/devtools/server/actors/inspector.js
@@ -3515,6 +3515,10 @@ var InspectorActor = exports.InspectorActor = protocol.ActorClass({
 
   destroy: function () {
     protocol.Actor.prototype.destroy.call(this);
+    this._highlighterPromise = null;
+    this._pageStylePromise = null;
+    this._walkerPromise = null;
+    this.walker = null;
   },
 
   // Forces destruction of the actor and all its children
@@ -3570,7 +3574,9 @@ var InspectorActor = exports.InspectorActor = protocol.ActorClass({
     }
 
     this._pageStylePromise = this.getWalker().then(walker => {
-      return PageStyleActor(this);
+      let pageStyle = PageStyleActor(this);
+      this.manage(pageStyle);
+      return pageStyle;
     });
     return this._pageStylePromise;
   }, {
diff --git a/toolkit/devtools/server/actors/styles.js b/toolkit/devtools/server/actors/styles.js
index fcb3d2f6cf13..3ad5f80104fd 100644
--- a/toolkit/devtools/server/actors/styles.js
+++ b/toolkit/devtools/server/actors/styles.js
@@ -332,7 +332,9 @@ let PageStyleActor = protocol.ActorClass({
 
       // If this font comes from a @font-face rule
       if (font.rule) {
-        fontFace.rule = StyleRuleActor(this, font.rule);
+        let styleActor = StyleRuleActor(this, font.rule);
+        this.manage(styleActor);
+        fontFace.rule = styleActor;
         fontFace.ruleText = font.rule.cssText;
       }