manifest(jarReader, name, true);
- NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
+ nsCString manifest;
+ MOZ_TRY_VAR(manifest, URLPreloader::ReadZip(jarReader, nsDependentCString(name)));
PrefParseState ps;
PREF_InitParseState(&ps, PREF_ReaderCallback, ReportToConsole, nullptr);
- PREF_ParseBuf(&ps, manifest, manifest.Length());
+ PREF_ParseBuf(&ps, manifest.get(), manifest.Length());
PREF_FinalizeParseState(&ps);
return NS_OK;
diff --git a/netwerk/protocol/http/HttpChannelChild.cpp b/netwerk/protocol/http/HttpChannelChild.cpp
index 6cf76cf018fd..a94463f5d24c 100644
--- a/netwerk/protocol/http/HttpChannelChild.cpp
+++ b/netwerk/protocol/http/HttpChannelChild.cpp
@@ -2304,6 +2304,18 @@ HttpChannelChild::AsyncOpen(nsIStreamListener *listener, nsISupports *aContext)
LOG(("HttpChannelChild::AsyncOpen [this=%p uri=%s]\n", this, mSpec.get()));
+ if (LOG4_ENABLED()) {
+ JSContext* cx = nsContentUtils::GetCurrentJSContext();
+ if (cx) {
+ nsAutoCString fileNameString;
+ uint32_t line = 0, col = 0;
+ if (nsJSUtils::GetCallingLocation(cx, fileNameString, &line, &col)) {
+ LOG(("HttpChannelChild %p source script=%s:%u:%u",
+ this, fileNameString.get(), line, col));
+ }
+ }
+ }
+
#ifdef DEBUG
AssertPrivateBrowsingId();
#endif
diff --git a/toolkit/components/extensions/ext-tabs-base.js b/toolkit/components/extensions/ext-tabs-base.js
index 5be339dd8119..e6be9efc46bc 100644
--- a/toolkit/components/extensions/ext-tabs-base.js
+++ b/toolkit/components/extensions/ext-tabs-base.js
@@ -491,6 +491,7 @@ class TabBase {
active: this.selected,
pinned: this.pinned,
status: this.status,
+ discarded: this.discarded,
incognito: this.incognito,
width: this.width,
height: this.height,
diff --git a/toolkit/components/passwordmgr/LoginManagerContent.jsm b/toolkit/components/passwordmgr/LoginManagerContent.jsm
index 13726cf17c7e..abf36cbc8912 100644
--- a/toolkit/components/passwordmgr/LoginManagerContent.jsm
+++ b/toolkit/components/passwordmgr/LoginManagerContent.jsm
@@ -37,6 +37,10 @@ XPCOMUtils.defineLazyGetter(this, "log", () => {
return logger.log.bind(logger);
});
+Services.cpmm.addMessageListener("clearRecipeCache", () => {
+ LoginRecipesContent._clearRecipeCache();
+});
+
// These mirror signon.* prefs.
var gEnabled, gAutofillForms, gStoreWhenAutocompleteOff;
var gLastRightClickTimeStamp = Number.NEGATIVE_INFINITY;
@@ -560,6 +564,9 @@ var LoginManagerContent = {
let doc = form.ownerDocument;
let autofillForm = gAutofillForms && !PrivateBrowsingUtils.isContentWindowPrivate(doc.defaultView);
+ let formOrigin = LoginUtils._getPasswordOrigin(doc.documentURI);
+ LoginRecipesContent.cacheRecipes(formOrigin, doc.defaultView, recipes);
+
this._fillForm(form, loginsFound, recipes, {autofillForm});
},
@@ -631,10 +638,8 @@ var LoginManagerContent = {
log("onUsernameInput from", event.type);
let doc = acForm.ownerDocument;
- let messageManager = messageManagerFromWindow(doc.defaultView);
- let recipes = messageManager.sendSyncMessage("RemoteLogins:findRecipes", {
- formOrigin: LoginUtils._getPasswordOrigin(doc.documentURI),
- })[0];
+ let formOrigin = LoginUtils._getPasswordOrigin(doc.documentURI);
+ let recipes = LoginRecipesContent.getRecipes(formOrigin, doc.defaultView);
// Make sure the username field fillForm will use is the
// same field as the autocomplete was activated on.
@@ -928,9 +933,7 @@ var LoginManagerContent = {
let formSubmitURL = LoginUtils._getActionOrigin(form);
let messageManager = messageManagerFromWindow(win);
- let recipes = messageManager.sendSyncMessage("RemoteLogins:findRecipes", {
- formOrigin: hostname,
- })[0];
+ let recipes = LoginRecipesContent.getRecipes(hostname, win);
// Get the appropriate fields from the form.
var [usernameField, newPasswordField, oldPasswordField] =
@@ -1345,10 +1348,8 @@ var LoginManagerContent = {
let form = LoginFormFactory.createFromField(aField);
let doc = aField.ownerDocument;
- let messageManager = messageManagerFromWindow(doc.defaultView);
- let recipes = messageManager.sendSyncMessage("RemoteLogins:findRecipes", {
- formOrigin: LoginUtils._getPasswordOrigin(doc.documentURI),
- })[0];
+ let formOrigin = LoginUtils._getPasswordOrigin(doc.documentURI);
+ let recipes = LoginRecipesContent.getRecipes(formOrigin, doc.defaultView);
let [usernameField, newPasswordField] =
this._getFormFields(form, false, recipes);
diff --git a/toolkit/components/passwordmgr/LoginRecipes.jsm b/toolkit/components/passwordmgr/LoginRecipes.jsm
index 28b27ca26d49..926492b457ca 100644
--- a/toolkit/components/passwordmgr/LoginRecipes.jsm
+++ b/toolkit/components/passwordmgr/LoginRecipes.jsm
@@ -113,6 +113,7 @@ LoginRecipesParent.prototype = {
resolve(JSON.parse(data));
});
}).then(recipes => {
+ Services.ppmm.broadcastAsyncMessage("clearRecipeCache");
return this.load(recipes);
}).then(resolve => {
return this;
@@ -189,6 +190,62 @@ LoginRecipesParent.prototype = {
var LoginRecipesContent = {
+ _recipeCache: new WeakMap(),
+
+ _clearRecipeCache() {
+ this._recipeCache = new WeakMap();
+ },
+
+ /**
+ * Locally caches recipes for a given host.
+ *
+ * @param {String} aHost (e.g. example.com:8080 [non-default port] or sub.example.com)
+ * @param {Object} win - the window of the host
+ * @param {Set} recipes - recipes that apply to the host
+ */
+ cacheRecipes(aHost, win, recipes) {
+ let recipeMap = this._recipeCache.get(win);
+
+ if (!recipeMap) {
+ recipeMap = new Map();
+ this._recipeCache.set(win, recipeMap);
+ }
+
+ recipeMap.set(aHost, recipes);
+ },
+
+ /**
+ * Tries to fetch recipes for a given host, using a local cache if possible.
+ * Otherwise, the recipes are cached for later use.
+ *
+ * @param {String} aHost (e.g. example.com:8080 [non-default port] or sub.example.com)
+ * @param {Object} win - the window of the host
+ * @return {Set} of recipes that apply to the host
+ */
+ getRecipes(aHost, win) {
+ let recipes;
+ let recipeMap = this._recipeCache.get(win);
+
+ if (recipeMap) {
+ recipes = recipeMap.get(aHost);
+
+ if (recipes) {
+ return recipes;
+ }
+ }
+
+ let mm = win.QueryInterface(Ci.nsIInterfaceRequestor)
+ .getInterface(Ci.nsIWebNavigation)
+ .QueryInterface(Ci.nsIDocShell)
+ .QueryInterface(Ci.nsIInterfaceRequestor)
+ .getInterface(Ci.nsIContentFrameMessageManager);
+
+ recipes = mm.sendSyncMessage("RemoteLogins:findRecipes", { formOrigin: aHost })[0];
+ this.cacheRecipes(aHost, win, recipes);
+
+ return recipes;
+ },
+
/**
* @param {Set} aRecipes - Possible recipes that could apply to the form
* @param {FormLike} aForm - We use a form instead of just a URL so we can later apply
diff --git a/toolkit/components/passwordmgr/test/mochitest/mochitest.ini b/toolkit/components/passwordmgr/test/mochitest/mochitest.ini
index a1d8ecad342a..18f44b6f5f0f 100644
--- a/toolkit/components/passwordmgr/test/mochitest/mochitest.ini
+++ b/toolkit/components/passwordmgr/test/mochitest/mochitest.ini
@@ -52,6 +52,7 @@ skip-if = toolkit == 'android' # autocomplete
[test_input_events.html]
[test_input_events_for_identical_values.html]
[test_maxlength.html]
+[test_onsubmit_value_change.html]
[test_passwords_in_type_password.html]
[test_prompt.html]
skip-if = os == "linux" || toolkit == 'android' # Tests desktop prompts
diff --git a/toolkit/components/passwordmgr/test/mochitest/test_basic_form_autocomplete.html b/toolkit/components/passwordmgr/test/mochitest/test_basic_form_autocomplete.html
index 2fe7033f6d56..2a2a36a3ee69 100644
--- a/toolkit/components/passwordmgr/test/mochitest/test_basic_form_autocomplete.html
+++ b/toolkit/components/passwordmgr/test/mochitest/test_basic_form_autocomplete.html
@@ -162,19 +162,19 @@
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
@@ -771,49 +771,10 @@
is(popupState.open, false, "Check popup stays closed due to cached empty result");
});
-add_task(async function test_form11_recipes() {
- await loadRecipes({
- siteRecipes: [{
- "hosts": ["mochi.test:8888"],
- "usernameSelector": "input[name='1']",
- "passwordSelector": "input[name='2']"
- }],
- });
- uname = $_(11, "1");
- pword = $_(11, "2");
-
- // First test DOMAutocomplete
- // Switch the password field to type=password so _fillForm marks the username
- // field for autocomplete.
- pword.type = "password";
- await promiseFormsProcessed();
- restoreForm();
- checkACForm("", "");
- let shownPromise = promiseACShown();
- doKey("down"); // open
- await shownPromise;
-
- doKey("down");
- checkACForm("", ""); // value shouldn't update
- doKey("return"); // not "enter"!
- await promiseFormsProcessed();
- checkACForm("testuser10", "testpass10");
-
- // Now test recipes with blur on the username field.
- restoreForm();
- checkACForm("", "");
- uname.value = "testuser10";
- checkACForm("testuser10", "");
- doKey("tab");
- await promiseFormsProcessed();
- checkACForm("testuser10", "testpass10");
- await resetRecipes();
-});
-
-add_task(async function test_form12_formless() {
+add_task(async function test_form11_formless() {
// Test form-less autocomplete
- uname = $_(12, "uname");
- pword = $_(12, "pword");
+ uname = $_(11, "uname");
+ pword = $_(11, "pword");
restoreForm();
checkACForm("", "");
let shownPromise = promiseACShown();
@@ -829,9 +790,9 @@
checkACForm("testuser", "testpass");
});
-add_task(async function test_form12_open_on_trusted_focus() {
- uname = $_(12, "uname");
- pword = $_(12, "pword");
+add_task(async function test_form11_open_on_trusted_focus() {
+ uname = $_(11, "uname");
+ pword = $_(11, "pword");
uname.value = "";
pword.value = "";
@@ -855,6 +816,45 @@
await processedPromise;
checkACForm("testuser", "testpass");
});
+
+add_task(async function test_form12_recipes() {
+ await loadRecipes({
+ siteRecipes: [{
+ "hosts": ["mochi.test:8888"],
+ "usernameSelector": "input[name='1']",
+ "passwordSelector": "input[name='2']"
+ }],
+ });
+ uname = $_(12, "1");
+ pword = $_(12, "2");
+
+ // First test DOMAutocomplete
+ // Switch the password field to type=password so _fillForm marks the username
+ // field for autocomplete.
+ pword.type = "password";
+ await promiseFormsProcessed();
+ restoreForm();
+ checkACForm("", "");
+ let shownPromise = promiseACShown();
+ doKey("down"); // open
+ await shownPromise;
+
+ doKey("down");
+ checkACForm("", ""); // value shouldn't update
+ doKey("return"); // not "enter"!
+ await promiseFormsProcessed();
+ checkACForm("testuser10", "testpass10");
+
+ // Now test recipes with blur on the username field.
+ restoreForm();
+ checkACForm("", "");
+ uname.value = "testuser10";
+ checkACForm("testuser10", "");
+ doKey("tab");
+ await promiseFormsProcessed();
+ checkACForm("testuser10", "testpass10");
+ await resetRecipes();
+});