Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 05:10:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1303874 - make the active window object part of the iterator params to make sure that similar iterator runs for different runs are not treated as the same, thus potentially yielding incorrect results. r=jaws

Browse Source 
MozReview-Commit-ID: H6gB2IMndM8
This commit is contained in:
Mike de Boer 2016-10-11 13:08:00 +02:00
parent 04666adb7d
commit ec296b4f2e
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
toolkit/modules/FinderHighlighter.jsm
View File

@ -213,7 +213,8 @@ FinderHighlighter.prototype = {
linksOnly, word,
finder: this.finder,
listener: this,
useCache: true
useCache: true,
window
};
if (this.iterator._areParamsEqual(params, dict.lastIteratorParams))
return this._found;

12
toolkit/modules/FinderIterator.jsm
View File

@ -118,7 +118,7 @@ this.FinderIterator = {
let window = finder._getWindow();
let resolver;
let promise = new Promise(resolve => resolver = resolve);
let iterParams = { caseSensitive, entireWord, linksOnly, useCache, word };
let iterParams = { caseSensitive, entireWord, linksOnly, useCache, window, word };
this._listeners.set(listener, { limit, onEnd: resolver });
@ -150,7 +150,7 @@ this.FinderIterator = {
// Start!
this.running = true;
this._currentParams = iterParams;
this._findAllRanges(finder, window, ++this._spawnId);
this._findAllRanges(finder, ++this._spawnId);
return promise;
},
@ -205,7 +205,7 @@ this.FinderIterator = {
this.running = true;
this._currentParams = iterParams;
this._findAllRanges(finder, finder._getWindow(), ++this._spawnId);
this._findAllRanges(finder, ++this._spawnId);
this._notifyListeners("restart", iterParams);
},
@ -309,6 +309,7 @@ this.FinderIterator = {
paramSet1.caseSensitive === paramSet2.caseSensitive &&
paramSet1.entireWord === paramSet2.entireWord &&
paramSet1.linksOnly === paramSet2.linksOnly &&
paramSet1.window === paramSet2.window &&
NLP.levenshtein(paramSet1.word, paramSet2.word) <= allowDistance);
},
@ -411,13 +412,12 @@ this.FinderIterator = {
* Internal; see the documentation of the start() method above.
*
* @param {Finder} finder Currently active Finder instance
* @param {nsIDOMWindow} window The window to search in
* @param {Number} spawnId Since `stop()` is synchronous and this method
* is not, this identifier is used to learn if
* it's supposed to still continue after a pause.
* @yield {nsIDOMRange}
*/
_findAllRanges: Task.async(function* (finder, window, spawnId) {
_findAllRanges: Task.async(function* (finder, spawnId) {
if (this._timeout) {
if (this._timer)
clearTimeout(this._timer);
@ -431,10 +431,10 @@ this.FinderIterator = {
this._notifyListeners("start", this.params);
let { linksOnly, window, word } = this._currentParams;
// First we collect all frames we need to search through, whilst making sure
// that the parent window gets dibs.
let frames = [window].concat(this._collectFrames(window, finder));
let { linksOnly, word } = this._currentParams;
let iterCount = 0;
for (let frame of frames) {
for (let range of this._iterateDocument(this._currentParams, frame)) {