Merge pull request #12782 from alivedise/bugzilla/925609/remove-windo…

…wmanager-screenshots

Bug 925609 - Remove WindowManager.screenshots, r=timdream

apps/system/js/cards_view.js

@@ -320,10 +320,7 @@ var CardsView = (function() {
                 // before we remove it. Otherwise the rendering is not smooth.
                 // See: https://bugzilla.mozilla.org/show_bug.cgi?id=844245
                 setTimeout(function() {
-
-                  // Override the cached image
-                  URL.revokeObjectURL(cachedLayer);
-                  WindowManager.screenshots[origin] = objectURL;
+                  app.saveCachedScreenshot(objectURL);
                 }, 200);
               }
             };

apps/system/js/window.js

@@ -257,13 +257,6 @@
 
         if (!this.iframe.classList.contains('hidden'))
           this._hideFrame();
-
-        // XXX: we ought not to change screenshots at Window Manager
-        // here. In the long run Window Manager should replace
-        // its screenshots variable with appWindow._screenshotURL.
-        if (WindowManager.screenshots[this.origin]) {
-          URL.revokeObjectURL(WindowManager.screenshots[this.origin]);
-        }
       }.bind(this));
     };
 
@@ -286,6 +279,9 @@
   // Save and update screenshot URL.
   AppWindow.prototype.saveCachedScreenshot =
     function aw_saveScreenshot(screenshot) {
+      if (this._screenshotURL) {
+        URL.revokeObjectURL(this._screenshotURL);
+      }
       this._screenshotURL = screenshot;
     };
 
@@ -319,6 +315,9 @@
 
     req.onsuccess = function gotScreenshotFromFrame(evt) {
       var result = evt.target.result;
+      if (self._screenshotURL) {
+        URL.revokeObjectURL(self._screenshotURL);
+      }
       self._screenshotURL = URL.createObjectURL(result);
       callback(result);
     };