Backout Bug 1351860, r=backout

This commit is contained in:
Olli Pettay
2017-03-31 16:55:32 -04:00
parent b9520e8c63
commit 694b05ce02
37 changed files with 76 additions and 69 deletions

View File

@@ -740,9 +740,8 @@ 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->ControlType() == NS_FORM_INPUT_PASSWORD)) {
if (mFocusedInputNode && (mPwmgrInputs.Get(mFocusedInputNode) ||
formControl->GetType() == NS_FORM_INPUT_PASSWORD)) {
// Handle the case where a password field is focused but
// MarkAsLoginManagerField wasn't called because password manager is disabled.
@@ -1034,7 +1033,7 @@ nsFormFillController::MaybeStartControllingInput(nsIDOMHTMLInputElement* aInput)
bool isPwmgrInput = false;
if (mPwmgrInputs.Get(inputNode) ||
formControl->ControlType() == NS_FORM_INPUT_PASSWORD) {
formControl->GetType() == NS_FORM_INPUT_PASSWORD) {
isPwmgrInput = true;
}
@@ -1049,7 +1048,7 @@ nsFormFillController::FocusEventDelayedCallback(nsIFormControl* aFormControl)
nsCOMPtr<nsIFormControl> formControl = do_QueryInterface(mFocusedInputNode);
if (!formControl || formControl != aFormControl ||
formControl->ControlType() != NS_FORM_INPUT_PASSWORD) {
formControl->GetType() != NS_FORM_INPUT_PASSWORD) {
return;
}