Backed out changeset 6b7069ed30e0 (bug 1330111) for causing frequent timeouts in browser_autocomplete_insecure_warning.js

This commit is contained in:
Carsten "Tomcat" Book 2017-02-07 14:03:42 +01:00
parent 220298580e
commit 9164286e22
2 changed files with 10 additions and 15 deletions

View File

@ -172,7 +172,6 @@ pref("browser.helperApps.deleteTempFileOnExit", false);
/* password manager */
pref("signon.rememberSignons", true);
pref("signon.autofillForms.http", true);
pref("signon.expireMasterPassword", false);
pref("signon.debug", false);

View File

@ -291,6 +291,7 @@ nsFormFillController::MarkAsLoginManagerField(nsIDOMHTMLInputElement *aInput)
if (!mFocusedInput) {
MaybeStartControllingInput(input);
}
ShowPopup();
}
}
@ -705,7 +706,6 @@ nsFormFillController::StartSearch(const nsAString &aSearchString, const nsAStrin
// If the login manager has indicated it's responsible for this field, let it
// handle the autocomplete. Otherwise, handle with form history.
// This method is sometimes called in unit tests and from XUL without a focused node.
if (mFocusedInputNode && (mPwmgrInputs.Get(mFocusedInputNode) ||
formControl->GetType() == NS_FORM_INPUT_PASSWORD)) {
@ -715,10 +715,6 @@ nsFormFillController::StartSearch(const nsAString &aSearchString, const nsAStrin
mLoginManager = do_GetService("@mozilla.org/login-manager;1");
}
if (NS_WARN_IF(!mLoginManager)) {
return NS_ERROR_FAILURE;
}
// XXX aPreviousResult shouldn't ever be a historyResult type, since we're not letting
// satchel manage the field?
mLastListener = aListener;
@ -996,10 +992,8 @@ nsFormFillController::MaybeStartControllingInput(nsIDOMHTMLInputElement* aInput)
bool hasList = datalist != nullptr;
bool isPwmgrInput = false;
if (mPwmgrInputs.Get(inputNode) ||
formControl->GetType() == NS_FORM_INPUT_PASSWORD) {
isPwmgrInput = true;
}
if (mPwmgrInputs.Get(inputNode))
isPwmgrInput = true;
if (isPwmgrInput || hasList || autocomplete) {
StartControllingInput(aInput);
@ -1019,17 +1013,19 @@ nsFormFillController::Focus(nsIDOMEvent* aEvent)
return NS_OK;
}
#ifndef ANDROID
nsCOMPtr<nsIFormControl> formControl = do_QueryInterface(mFocusedInputNode);
MOZ_ASSERT(formControl);
// If this focus doesn't immediately follow a contextmenu event then show
// the autocomplete popup for all password fields.
if (!mContextMenuFiredBeforeFocus
&& formControl->GetType() == NS_FORM_INPUT_PASSWORD) {
// the autocomplete popup
if (!mContextMenuFiredBeforeFocus &&
(mPwmgrInputs.Get(mFocusedInputNode)
#ifndef ANDROID
|| formControl->GetType() == NS_FORM_INPUT_PASSWORD
#endif
)) {
ShowPopup();
}
#endif
mContextMenuFiredBeforeFocus = false;
return NS_OK;