Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset f39e67694994 (bug 1302470) for failing mochitest test_bug263683.xul on opt-based builds on Linux and on debug on OSX, at least. r=backout

Browse Source
This commit is contained in:
Sebastian Hengst 2017-04-21 19:09:12 +02:00
parent 0565ac832f
commit e35a5d0b79
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
toolkit/components/typeaheadfind/nsTypeAheadFind.cpp
View File

@ -423,7 +423,7 @@ nsTypeAheadFind::FindItNow(nsIPresShell *aPresShell, bool aIsLinksOnly,
while (true) { // === Inner while loop: go through a single doc ===
mFind->Find(mTypeAheadBuffer.get(), mSearchRange, mStartPointRange,
mEndPointRange, getter_AddRefs(returnRange));
if (!returnRange)
break; // Nothing found in this doc, go to outer loop (try next doc)
@ -1009,18 +1009,18 @@ nsTypeAheadFind::Find(const nsAString& aSearchString, bool aLinksOnly,
return NS_OK;
}
bool atEnd = false;
bool atEnd = false;
if (mTypeAheadBuffer.Length()) {
const nsAString& oldStr = Substring(mTypeAheadBuffer, 0, mTypeAheadBuffer.Length());
const nsAString& newStr = Substring(aSearchString, 0, mTypeAheadBuffer.Length());
if (oldStr.Equals(newStr))
atEnd = true;
const nsAString& newStr2 = Substring(aSearchString, 0, aSearchString.Length());
const nsAString& oldStr2 = Substring(mTypeAheadBuffer, 0, aSearchString.Length());
if (oldStr2.Equals(newStr2))
atEnd = true;
if (!atEnd)
mStartFindRange = nullptr;
}

2
toolkit/components/typeaheadfind/nsTypeAheadFind.h
View File

@ -95,7 +95,7 @@ protected:
// If we destroy mSoundInterface before sound has played, it won't play
nsCOMPtr<nsISound> mSoundInterface;
bool mIsSoundInitialized;
// where selection was when user started the find
nsCOMPtr<nsIDOMRange> mStartFindRange;
nsCOMPtr<nsIDOMRange> mSearchRange;