Bug 1456391 - Part 7: Move PrivacyFilter to Toolkit. r?mikedeboer
Since we want to start collecting all form data through mapFrameTree on Fennec,
too, we need to change our filtering strategy for form data.
We can no longer bail out directly during the data collection loop and instead
have to filter the data after having collected all of it.
The easiest way to do that is to start using PrivacyFilter.filterFormData() on
Android as well.
MozReview-Commit-ID: GBos4Zn3l2U
--- a/browser/components/sessionstore/SessionSaver.jsm
+++ b/browser/components/sessionstore/SessionSaver.jsm
@@ -8,17 +8,17 @@ var EXPORTED_SYMBOLS = ["SessionSaver"];
ChromeUtils.import("resource://gre/modules/Timer.jsm", this);
ChromeUtils.import("resource://gre/modules/Services.jsm", this);
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm", this);
ChromeUtils.import("resource://gre/modules/TelemetryStopwatch.jsm", this);
XPCOMUtils.defineLazyModuleGetters(this, {
AppConstants: "resource://gre/modules/AppConstants.jsm",
- PrivacyFilter: "resource:///modules/sessionstore/PrivacyFilter.jsm",
+ PrivacyFilter: "resource://gre/modules/sessionstore/PrivacyFilter.jsm",
RunState: "resource:///modules/sessionstore/RunState.jsm",
SessionStore: "resource:///modules/sessionstore/SessionStore.jsm",
SessionFile: "resource:///modules/sessionstore/SessionFile.jsm",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
});
/*
* Minimal interval between two save operations (in milliseconds).
--- a/browser/components/sessionstore/SessionStore.jsm
+++ b/browser/components/sessionstore/SessionStore.jsm
@@ -169,17 +169,17 @@ XPCOMUtils.defineLazyServiceGetters(this
});
XPCOMUtils.defineLazyModuleGetters(this, {
AppConstants: "resource://gre/modules/AppConstants.jsm",
AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm",
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
DevToolsShim: "chrome://devtools-startup/content/DevToolsShim.jsm",
GlobalState: "resource:///modules/sessionstore/GlobalState.jsm",
- PrivacyFilter: "resource:///modules/sessionstore/PrivacyFilter.jsm",
+ PrivacyFilter: "resource://gre/modules/sessionstore/PrivacyFilter.jsm",
PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
RunState: "resource:///modules/sessionstore/RunState.jsm",
SessionCookies: "resource:///modules/sessionstore/SessionCookies.jsm",
SessionFile: "resource:///modules/sessionstore/SessionFile.jsm",
SessionSaver: "resource:///modules/sessionstore/SessionSaver.jsm",
TabAttributes: "resource:///modules/sessionstore/TabAttributes.jsm",
TabCrashHandler: "resource:///modules/ContentCrashHandlers.jsm",
TabState: "resource:///modules/sessionstore/TabState.jsm",
--- a/browser/components/sessionstore/TabState.jsm
+++ b/browser/components/sessionstore/TabState.jsm
@@ -4,17 +4,17 @@
"use strict";
var EXPORTED_SYMBOLS = ["TabState"];
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm", this);
ChromeUtils.defineModuleGetter(this, "PrivacyFilter",
- "resource:///modules/sessionstore/PrivacyFilter.jsm");
+ "resource://gre/modules/sessionstore/PrivacyFilter.jsm");
ChromeUtils.defineModuleGetter(this, "TabStateCache",
"resource:///modules/sessionstore/TabStateCache.jsm");
ChromeUtils.defineModuleGetter(this, "TabAttributes",
"resource:///modules/sessionstore/TabAttributes.jsm");
ChromeUtils.defineModuleGetter(this, "Utils",
"resource://gre/modules/sessionstore/Utils.jsm");
/**
--- a/browser/components/sessionstore/moz.build
+++ b/browser/components/sessionstore/moz.build
@@ -19,17 +19,16 @@ EXTRA_COMPONENTS += [
'nsSessionStartup.js',
'nsSessionStartup.manifest',
]
EXTRA_JS_MODULES.sessionstore = [
'ContentRestore.jsm',
'DocShellCapabilities.jsm',
'GlobalState.jsm',
- 'PrivacyFilter.jsm',
'RecentlyClosedTabsAndWindowsMenuUtils.jsm',
'RunState.jsm',
'SessionCookies.jsm',
'SessionFile.jsm',
'SessionMigration.jsm',
'SessionSaver.jsm',
'SessionStorage.jsm',
'SessionStore.jsm',
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -254,16 +254,17 @@ EXTRA_JS_MODULES += [
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
EXTRA_JS_MODULES += [
'PropertyListUtils.jsm',
]
EXTRA_JS_MODULES.third_party.jsesc += ['third_party/jsesc/jsesc.js']
EXTRA_JS_MODULES.sessionstore += [
+ 'sessionstore/PrivacyFilter.jsm',
'sessionstore/PrivacyLevel.jsm',
'sessionstore/SessionHistory.jsm',
'sessionstore/Utils.jsm',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk3'):
DEFINES['MENUBAR_CAN_AUTOHIDE'] = 1
rename from browser/components/sessionstore/PrivacyFilter.jsm
rename to toolkit/modules/sessionstore/PrivacyFilter.jsm
