corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1337772 - Fix intermittent browser_context_menu_autocomplete_interaction.js. r=MattN

Browse Source 
MozReview-Commit-ID: 6vAWN4z2wRP
This commit is contained in:
Johann Hofmann
2017-03-01 20:05:38 +01:00
parent aac5af560f
commit 48b937717f
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
toolkit/components/satchel/nsFormFillController.cpp
View File

@@ -68,13 +68,14 @@ nsFormFillController::nsFormFillController() :
mFocusedInput(nullptr),
mFocusedInputNode(nullptr),
mListNode(nullptr),
// This matches the threshold in
// The amount of time a context menu event supresses showing a
// popup from a focus event in ms. This matches the threshold in
// toolkit/components/passwordmgr/LoginManagerContent.jsm.
mFocusAfterContextMenuThreshold(250),
mFocusAfterContextMenuThreshold(400),
mTimeout(50),
mMinResultsForPopup(1),
mMaxRows(0),
mLastContextMenuEventTimeStamp(TimeStamp::Now()),
mLastContextMenuEventTimeStamp(TimeStamp()),
mDisableAutoComplete(false),
mCompleteDefaultIndex(false),
mCompleteSelectedIndex(false),
@@ -1029,18 +1030,24 @@ nsFormFillController::FocusEventDelayedCallback(nsIFormControl* aFormControl)
{
nsCOMPtr<nsIFormControl> formControl = do_QueryInterface(mFocusedInputNode);
if (!formControl || formControl != aFormControl) {
if (!formControl || formControl != aFormControl ||
formControl->GetType() != NS_FORM_INPUT_PASSWORD) {
return;
}
// If we have not seen a context menu call yet, just show the popup.
if (mLastContextMenuEventTimeStamp.IsNull()) {
ShowPopup();
return;
}
uint64_t timeDiff = fabs((TimeStamp::Now() - mLastContextMenuEventTimeStamp).ToMilliseconds());
// If this focus doesn't follow a contextmenu event within our specified
// threshold then show the autocomplete popup for all password fields.
// This is done to avoid showing both the context menu and the popup
// at the same time. The threshold should be a low amount of time that
// makes it impossible for the user to accidentally trigger this condition.
if (timeDiff > mFocusAfterContextMenuThreshold
&& formControl->GetType() == NS_FORM_INPUT_PASSWORD) {
if (timeDiff > mFocusAfterContextMenuThreshold) {
ShowPopup();
}
}