Simplify grip access

Author: janodvarko

lib/chrome/context.js

@@ -10,7 +10,6 @@ const { Trace, TraceError } = require("../core/trace.js").get(module.id);
 const { EventTarget } = require("sdk/event/target");
 const { Class } = require("sdk/core/heritage");
 const { defer } = require("sdk/core/promise");
-const { DomCache } = require("../dom/dom-cache.js");
 const { Obj } = require("../core/object.js");
 const { Url } = require("../core/url.js");
 
@@ -75,27 +74,6 @@ const Context = Class(
     return this.chrome.getBrowserDoc();
   },
 
-  // Cache
-
-  getCache: function() {
-    let deferred = defer();
-
-    // Use existing cache if possible.
-    if (this.cache) {
-      deferred.resolve(this.cache);
-      return deferred.promise;
-    }
-
-    // Initialize cache.
-    let target = this.toolbox.target;
-    target.activeTab.attachThread({}, (response, threadClient) => {
-      this.cache = new DomCache(threadClient);
-      deferred.resolve(this.cache);
-    });
-
-    return deferred.promise;
-  },
-
   // Timeouts
 
   // xxxHonza: all timeouts should be set/cleared through the context

lib/console/performance-timing.js

@@ -14,10 +14,10 @@ const { Reps } = require("../reps/reps.js");
 const { Dom } = require("../core/dom.js");
 const { Locale } = require("../core/locale.js");
 const { Str } = require("../core/string.js");
-const { DomCache } = require("../dom/dom-cache.js");
 
 const { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 const { Messages } = devtools["require"]("devtools/webconsole/console-output");
+const { GripProvider } = require("../dom/grip-provider.js");
 
 const Heritage = require("sdk/core/heritage");
 const Simple = Messages.Simple;
@@ -47,18 +47,14 @@ function logPerformanceTiming(consoleOverlay, msg) {
   // Doing the log asynchronously could be too late and some other
   // logs could jump in.
 
-  let context = consoleOverlay.getContext();
-
-  // Get the current thread actor and render the object structure.
-  context.getCache().then(cache => {
-    let grip = msg.response.result;
-    cache.getPrototypeAndProperties(grip).then(response => {
-      let ownProperties = response.ownProperties;
-      let timing = validateTiming(ownProperties);
-      let result = calculateTiming(timing);
-      let message = new PerformanceTimingMessage(result);
-      hud.ui.output.addMessage(message);
-    });
+  let grip = msg.response.result;
+  let provider = new GripProvider(target);
+  provider.getPrototypeAndProperties(grip).then(response => {
+    let ownProperties = response.ownProperties;
+    let timing = validateTiming(ownProperties);
+    let result = calculateTiming(timing);
+    let message = new PerformanceTimingMessage(result);
+    hud.ui.output.addMessage(message);
   });
 }
 

lib/dom/dom-panel.js

@@ -18,6 +18,7 @@ const { Str } = require("firebug.sdk/lib/core/string.js");
 const { Locale } = require("../core/locale.js");
 const { Trace, TraceError } = require("../core/trace.js").get(module.id);
 const { BasePanel } = require("../chrome/base-panel.js");
+const { GripProvider } = require("../dom/grip-provider.js");
 
 // xxxHonza: part of the workaround for 1075490 (see the bottom of the file).
 // Use the same weird panel ID that is generated by the SDK.
@@ -150,8 +151,8 @@ const DomPanel = Class(
   },
 
   onGetPrototypeAndProperties: function(grip) {
-    let client = this.threadClient.pauseGrip(grip);
-    client.getPrototypeAndProperties(response => {
+    let provider = new GripProvider(this.toolbox.target);
+    provider.getPrototypeAndProperties(grip).then(response => {
       this.postContentMessage("prototypeAndProperties",
         JSON.stringify(response));
     });

lib/dom/dom-provider.js

@@ -6,26 +6,21 @@ module.metadata = {
   "stability": "experimental"
 };
 
+const { Cu } = require("chrome");
 const { Trace, TraceError } = require("../core/trace.js").get(module.id);
 const { defer } = require("sdk/core/promise");
+const { ObjectClient } = Cu.import("resource://gre/modules/devtools/dbg-client.jsm", {});
 
 // Implementation
-function DomCache(threadClient) {
-  this.threadClient = threadClient;
-  this.cache = new Map();
+
+function GripProvider(target) {
+  this.target = target;
 }
 
 /**
- * This object is responsible for caching RDP responses an optimizing
- * wire data transfer.
- *
- * TODO:
- * 1) Make sure to clean up the cache (or specific entries) when necessary.
- * It might happen the properties of an object change and we need to
- * re-request it.
  */
-DomCache.prototype =
-/** @lends DomCache */
+GripProvider.prototype =
+/** @lends GripProvider */
 {
   /**
    * Sends "prototypeAndProperties" packet to get properties for
@@ -34,37 +29,23 @@ DomCache.prototype =
    * @param {Grip} Grip object (remote reference to server side actor).
    */
   getPrototypeAndProperties: function(grip) {
-    Trace.sysout("domCache.getPrototypeAndProperties;", grip);
+    Trace.sysout("GripProvider.getPrototypeAndProperties;", grip);
 
     if (!grip.actor) {
-      TraceError.sysout("domCache.getPrototypeAndProperties; no actor!", grip);
+      TraceError.sysout("GripProvider.getPrototypeAndProperties; no actor!", grip);
       return;
     }
 
     let deferred = defer();
 
-    // If the response is already in the cache resolve immediately.
-    let cachedResponse = this.cache.get(grip.actor);
-    if (cachedResponse) {
-      Trace.sysout("domCache.getPrototypeAndProperties; " +
-          "Response from cache:", { response: cachedResponse });
-
-      deferred.resolve(cachedResponse);
-      return deferred.promise;
-    }
-
-    // Fetch properties from the server side (asynchronously).
-    let client = this.threadClient.pauseGrip(grip);
+    let client = new ObjectClient(this.target.client, grip);
     client.getPrototypeAndProperties(response => {
       mergeProperties(response);
 
-      Trace.sysout("domCache.getPrototypeAndProperties; Response received:", {
+      Trace.sysout("GripProvider.getPrototypeAndProperties; Response received:", {
         response: response,
       });
 
-      // Store the response in the cache.
-      this.cache.set(grip.actor, response);
-
       deferred.resolve(response);
     });
 
@@ -92,4 +73,4 @@ function mergeProperties(response) {
 }
 
 // Exports from this module
-exports.DomCache = DomCache;
+exports.GripProvider = GripProvider;