Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: chrome/content/common.js

Issue 29360039: Issue 4576 - Reinstate FilterStorage read/write integration test and test with please_kill_startup… (Closed) Base URL: https://hg.adblockplus.org/adblockplustests
Patch Set: Addressed comments Created Oct. 28, 2016, 11:09 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/content/tests/filterStorage_readwrite.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 const Cc = Components.classes; 1 const Cc = Components.classes;
2 const Ci = Components.interfaces; 2 const Ci = Components.interfaces;
3 const Cr = Components.results; 3 const Cr = Components.results;
4 const Cu = Components.utils; 4 const Cu = Components.utils;
5 5
6 const {Services} = Cu.import("resource://gre/modules/Services.jsm", {}); 6 const {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
7 7
8 const SDK = Cu.import("resource://gre/modules/commonjs/toolkit/require.js", {}); 8 const SDK = Cu.import("resource://gre/modules/commonjs/toolkit/require.js", {});
9 SDK.require("sdk/tabs"); 9 SDK.require("sdk/tabs");
10 10
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 58
59 this._backup = { 59 this._backup = {
60 subscriptions: FilterStorage.subscriptions, 60 subscriptions: FilterStorage.subscriptions,
61 storageKnown: FilterStorage.knownSubscriptions, 61 storageKnown: FilterStorage.knownSubscriptions,
62 subscriptionsKnown: Subscription.knownSubscriptions, 62 subscriptionsKnown: Subscription.knownSubscriptions,
63 filtersKnown: Filter.knownFilters, 63 filtersKnown: Filter.knownFilters,
64 listeners: FilterNotifierGlobal.listeners, 64 listeners: FilterNotifierGlobal.listeners,
65 sourceFile: FilterStorage.sourceFile 65 sourceFile: FilterStorage.sourceFile
66 }; 66 };
67 67
68 FilterStorage._loading = false;
68 FilterStorage.subscriptions = []; 69 FilterStorage.subscriptions = [];
69 FilterStorage.knownSubscriptions = Object.create(null); 70 FilterStorage.knownSubscriptions = Object.create(null);
70 Subscription.knownSubscriptions = Object.create(null); 71 Subscription.knownSubscriptions = Object.create(null);
71 Filter.knownFilters = Object.create(null); 72 Filter.knownFilters = Object.create(null);
72 if (!keepListeners) 73 if (!keepListeners)
73 { 74 {
74 FilterNotifierGlobal.listeners = []; 75 FilterNotifierGlobal.listeners = [];
75 } 76 }
76 77
77 defaultMatcher.clear(); 78 defaultMatcher.clear();
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 return oldFinish.apply(this, arguments); 221 return oldFinish.apply(this, arguments);
221 } 222 }
222 window.addEventListener("unload", function() 223 window.addEventListener("unload", function()
223 { 224 {
224 debuggerService.off(); 225 debuggerService.off();
225 }, true); 226 }, true);
226 debuggerService.on(); 227 debuggerService.on();
227 debuggerService.flags |= debuggerService.COLLECT_PROFILE_DATA; 228 debuggerService.flags |= debuggerService.COLLECT_PROFILE_DATA;
228 debuggerService.clearProfileData(); 229 debuggerService.clearProfileData();
229 } 230 }
OLDNEW
« no previous file with comments | « no previous file | chrome/content/tests/filterStorage_readwrite.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld