Issue 2040 - Replaced localStorage with chrome.storage.local

safari/ext/background.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 149 matching lines @@
     // toolbar item of the window, is reset to its intial configuration.
     updateToolbarItemForPage(event.target._visiblePage, event.target.browserWindow);
   }, true);
 
 
   /* Pages */
 
   var pages = Object.create(null);
   var pageCounter = 0;
 
+  var Frame = function(url, parent)
+  {
+    this._urlString = url;
+    this._urlObj = null;
+
+    this.parent = parent;
+  }
+  Frame.prototype = {
+    get url()
+    {
+      // On Safari 6 and before, the URL constuctor doesn't exist.
+      // The "urls" module provides a polifill, but it might not
+      // be loaded yet. So we have to lazily parse URLs.
+      if (!this._urlObj)
+      {
+        this._urlObj = new URL(this._urlString);
+        this._urlString = null;
+      }
+
+      return this._urlObj;
+    }
+  };
+
   var Page = function(id, tab, url)
   {
     this._id = id;
     this._tab = tab;
-    this._frames = [{url: new URL(url), parent: null}];
+    this._frames = [new Frame(url, null)];
 
     if (tab.page)
       this._messageProxy = new ext._MessageProxy(tab.page);
     else
       // while the new tab page is shown on Safari 7, the 'page' property
       // of the tab is undefined, and we can't send messages to that page
       this._messageProxy = {
         handleRequest: function() {},
         handleResponse: function() {},
         sendMessage: function() {}
@@ skipping 424 matching lines @@
               // if we can't find the parent frame and its page, fall back to
               // the page most recently loaded in the tab and its top level frame
               if (!page)
               {
                 pageId = lastPageId;
                 page = lastPage;
                 parentFrame = lastPageTopLevelFrame;
               }
 
               frameId = page._frames.length;
-              page._frames.push({url: new URL(message.url), parent: parentFrame});
+              page._frames.push(new Frame(message.url, parentFrame));
             }
             event.message = {pageId: pageId, frameId: frameId};
             break;
           case "webRequest":
             var page = pages[event.message.pageId];
             var frame = page._frames[event.message.frameId];
 
             var results = ext.webRequest.onBeforeRequest._dispatch(
               new URL(event.message.url, frame.url),
               event.message.type, page, frame
@@ skipping 66 matching lines @@
     {
       delete safari.extension.settings[key];
 
       if (callback)
         setTimeout(callback, 0);
     },
     onChanged: new ext._EventTarget(),
 
     // Preferences were previously encoded as JSON for compatibility
     // with localStorage, which has been used on Chrome.
-    migratePrefs: function(mapFunc)
+    migratePrefs: function(hooks)
     {
       var settings = safari.extension.settings;
 
       for (var key in settings)
       {
-        var item = mapFunc(key, settings[key]);
+        var item = hooks.map(key, settings[key]);
+
         if (item)

[Wladimir Palant, 2015/03/16 12:20:26]

Add |&& item.key != key| here? I think we will keep "migrating" currentVersion
until the end of times otherwise. Should have a comment explaining this of
course.

[Sebastian Noack, 2015/03/16 12:54:34]

Done.

         {
           delete settings[key];
           settings[item.key] = item.value;
         }
       }
+
+      hooks.done();
     }
   };
 
   safari.extension.settings.addEventListener("change", function(event)
   {
     var changes = {};
     var change = changes[event.key] = {};
 
     if (event.oldValue != null)
       change.oldValue = event.oldValue;
@@ skipping 20 matching lines @@
         tab.activate();
         if (callback)
           callback(page);
         return;
       }
     }
 
     ext.pages.open(optionsUrl, callback);
   };
 })();