Issue 653 -Object.defineProperty instead of defineGetter / defineSetter

lib/filterStorage.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 67 matching lines @@
       {
         file = IO.resolveFilePath(Services.prefs.getDefaultBranch("extensions.adblockplus.").getCharPref("data_directory"));
         if (file)
           file.append("patterns.ini");
       } catch(e) {}
     }
 
     if (!file)
       Cu.reportError("Adblock Plus: Failed to resolve filter file location from extensions.adblockplus.patternsfile preference");
 
-    this.__defineGetter__("sourceFile", () => file);
-    return this.sourceFile;
+    Object.defineProperty(FilterStorage, "sourceFile", {value: file});

[Wladimir Palant, 2014/06/23 11:12:41]

Keep using this rather than FilterStorage here?

+    return file;
   },
 
   /**
    * Will be set to true if no patterns.ini file exists.
    * @type Boolean
    */
   firstRun: false,
 
   /**
    * Map of properties listed in the filter storage file before the sections
@@ skipping 788 matching lines @@
       Subscription.knownSubscriptions = origKnownSubscriptions;
     }
 
     // Allow events to be processed every now and then.
     // Note: IO.readFromFile() will deal with the potential reentrance here.
     this.linesProcessed++;
     if (this.linesProcessed % 1000 == 0)
       Utils.yield();
   }
 };