зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset a4212d9e1d0b (bug 1302470) for eslint failure
--HG-- extra : rebase_source : 07bd41104145d6329f244f77be9c69dae36ff759
This commit is contained in:
Родитель
7b9ea72f65
Коммит
114ebfd44a
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче