Issue 2816 - Restore Preview functionality

chrome/content/actor.jsm

Index: chrome/content/actor.jsm
===================================================================
--- a/chrome/content/actor.jsm
+++ b/chrome/content/actor.jsm
@@ -1,72 +1,91 @@
 /*
  * This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
  * http://mozilla.org/MPL/2.0/.
  */
 
-let EXPORTED_SYMBOLS = ["shutdown", "getNodeInfo"];
+let EXPORTED_SYMBOLS = ["shutdown", "getNodeInfo", "togglePreview",
+                        "forgetNode"];
 
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 
 let {console} = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
 let {DebuggerServer} = Cu.import("resource://gre/modules/devtools/dbg-server.jsm", {});
+let {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
+
+let processID = Services.appinfo.processID;
+let maxNodeID = 0;
+let nodes = new Map();
+
 let name = "elemhidehelper";
 let actor = {
   constructorFun: Actor,
   constructorName: name,
   name: name
 };
 
 DebuggerServer.addTabActor(actor, name);
 
 let shutdown = (function()
 {
   let executed = false;
   return function()
   {
     if (!executed)
-      DebuggerServer.removeTabActor(actor);
-    executed = true;
+    {
+      executed = true;
+      try
+      {
+        DebuggerServer.removeTabActor(actor);

[Wladimir Palant, 2015/07/31 14:40:04]

This will throw in the content process, I suspect that our way to register the
actor is incorrect. I will investigate this further but in the meantime catching
this error allows the execution to continue - meaning that we won't leave
message handlers attached on shutdown.

[Wladimir Palant, 2015/07/31 15:09:36]

My investigation shows that we are doing everything correctly. This seems to be
a bug in the developer tools, they aren't really testing cleanup it seems (it's
only required for restartless extensions, not built-in actors). Filed
https://bugzilla.mozilla.org/show_bug.cgi?id=1189780 on this, I added a
corresponding comment to the code here.

+      }
+      catch (e)
+      {
+        Cu.reportError(e);
+      }
+    }
   }
 })();
 
 function Actor(connection, tabActor)
 {
 }
 
 Actor.prototype = {
   requestTypes: {
     nodeinfo: function(request, connection)
     {
       let nodeActor = connection.getActor(request.nodeActor);
-      if (!nodeActor || !nodeActor.rawNode ||
-          nodeActor.rawNode.nodeType != Ci.nsIDOMNode.ELEMENT_NODE)
-      {
-        return {};
-      }
-
-      return getNodeInfo(nodeActor.rawNode);
+      return getNodeInfo(nodeActor ? nodeActor.rawNode: null);
     }
   }
 };
 
 function getNodeInfo(node)
 {
-  return {
-    host: node.ownerDocument.defaultView.location.hostname,
-    nodeData: getNodeData(node)
-  };
+  let nodeData = getNodeData(node);
+  if (nodeData)
+  {
+    let nodeID = processID + "-" + (++maxNodeID);
+    nodes.set(nodeID, {document: node.ownerDocument, style: null});
+    return {
+      host: node.ownerDocument.defaultView.location.hostname,
+      nodeData: nodeData,
+      nodeID: nodeID
+    };
+  }
+
+  return {};
 }
 
 function getNodeData(node, parentNode)
 {
-  if (!node)
+  if (!node || node.nodeType != Ci.nsIDOMNode.ELEMENT_NODE)
     return null;
 
   let result = {};
   result.tagName = {value: node.tagName, checked: false};
 
   if (typeof parentNode != "undefined")
     result.parentNode = parentNode;
   else
@@ -103,8 +122,48 @@ function getNodeData(node, parentNode)
     let tmp = result.attributes[1];
     result.attributes[1] = result.attributes[0];
     result.attributes[0] = tmp;
   }
 
   result.customCSS = {selected: "", checked: false};
   return result;
 }
+
+function togglePreview(nodeID, stylesheetData)
+{
+  let context = nodes.get(nodeID);
+  if (!context)
+    return;
+
+  if (stylesheetData)
+  {
+    if (!context.style || !context.style.parentNode)
+    {
+      context.style = context.document.createElementNS(
+          "http://www.w3.org/1999/xhtml", "style");
+      context.style.setAttribute("type", "text/css");
+      context.document.documentElement.appendChild(context.style);
+    }
+    context.style.textContent = stylesheetData;
+  }
+  else
+  {
+    try
+    {
+      if (context.style && context.style.parentNode)
+        context.style.parentNode.removeChild(context.style);
+      context.style = null;
+    }
+    catch (e)
+    {
+      // If the window was closed (reloaded) we end up with a dead object
+      // reference (https://bugzilla.mozilla.org/show_bug.cgi?id=695480). Just
+      // forget this node then.
+      forgetNode(nodeID);
+    }
+  }
+}
+
+function forgetNode(nodeID)
+{
+  nodes.delete(nodeID);
+}