issue #660 - HTTP cache api v2 fixes

chrome/content/ui/sidebar.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 182 matching lines @@
   if (requestNotifier)
     requestNotifier.shutdown();
 
   treeView.clearData();
   treeView.itemToSelect = RequestNotifier.getSelection(window.content);
   requestNotifier = new RequestNotifier(window.content, function(wnd, node, item, scanComplete)
   {
     if (item)
       treeView.addItem(node, item, scanComplete);
   });
+  cacheStorage = null;
 }
 
 // Fills a box with text splitting it up into multiple lines if necessary
 function setMultilineContent(box, text, noRemove)
 {
   if (!noRemove)
     while (box.firstChild)
       box.removeChild(box.firstChild);
 
   for (var i = 0; i < text.length; i += 80)
@@ skipping 82 matching lines @@
   var showPreview = Prefs.previewimages && !("tooltip" in item);
   showPreview = showPreview && item.typeDescr == "IMAGE";
   showPreview = showPreview && (!item.filter || item.filter.disabled || item.filter instanceof WhitelistFilter);
   E("tooltipPreviewBox").hidden = true;
   if (showPreview)
   {
     if (!cacheStorage)
     {
       let {Services} = Cu.import("resource://gre/modules/Services.jsm", null);
       // Cache v2 API is enabled by default starting with Gecko 32
-      if (Services.vc.compare(Utils.platformVersion, "32.0") >= 0)
+      if (Services.vc.compare(Utils.platformVersion, "32.0a1") >= 0)
       {
         let {LoadContextInfo} = Cu.import("resource://gre/modules/LoadContextInfo.jsm", null);
-        cacheStorage = Services.cache2.diskCacheStorage(LoadContextInfo.default, true);
+        cacheStorage = Services.cache2.diskCacheStorage(LoadContextInfo.fromLoadContext(
+                       content.QueryInterface(Ci.nsIInterfaceRequestor)
+                      .getInterface(Ci.nsIWebNavigation)
+                      .QueryInterface(Ci.nsILoadContext), false), false);

[Wladimir Palant, 2014/07/04 18:09:00]

Nit: The indentation here is strange, normally you want to align the dots. It's
probably best to have a temp variable for the load context:

var loadContext = content.QueryInterface(Ci.nsIInterfaceRequestor)
                         .getInterface(Ci.nsIWebNavigation)
                         .QueryInterface(Ci.nsILoadContext);

This will make things easier to read, and indentation will no longer be an
issue.

[saroyanm, 2014/07/04 19:32:12]

Done.

       }
       else
         cacheStorage = Services.cache.createSession("HTTP", Ci.nsICache.STORE_ANYWHERE, true);
     }
     
     let showTooltipPreview = function ()
     {
       E("tooltipPreview").setAttribute("src", item.location);
       E("tooltipPreviewBox").hidden = false;
     };
     try
     {
       if (Ci.nsICacheStorage && cacheStorage instanceof Ci.nsICacheStorage)
       {
         cacheStorage.asyncOpenURI(Utils.makeURI(item.location), "", Ci.nsICacheStorage.OPEN_READONLY, {
-          onCacheEntryCheck: function (entry, appCache)

[Wladimir Palant, 2014/07/04 18:09:00]

Please don't remove the parameters even if you don't use them. You already fixed
the wrong onCacheEntryAvailable signature.

[saroyanm, 2014/07/04 19:32:12]

My bad.

+          onCacheEntryCheck: function ()
           {
             return Ci.nsICacheEntryOpenCallback.ENTRY_WANTED;
           },
-          onCacheEntryAvailable: function (entry, isNew, appCache, status) {
+          onCacheEntryAvailable: function (entry, isNew) {
             if (!isNew)
               showTooltipPreview();
           }
         });
       }
       else
       {
         cacheStorage.asyncOpenCacheEntry(item.location, Ci.nsICache.ACCESS_READ, {
-          onCacheEntryAvailable: function(descriptor, accessGranted, status)
+          onCacheEntryAvailable: function(descriptor)
           {
             if (!descriptor)
               return;
             descriptor.close();
             showTooltipPreview();
           },
           onCacheEntryDoomed: function(status)
           {
           }
         });
@@ skipping 909 matching lines @@
       return {tooltip: this.itemsDummyTooltip};
   },
 
   invalidateItem: function(item)
   {
     let row = this.data.indexOf(item);
     if (row >= 0)
       this.boxObject.invalidateRow(row);
   }
 }