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

Merge fx-team to central, a=merge

Browse Source
This commit is contained in:
Wes Kocher 2016-09-16 13:57:38 -07:00
commit f6145cfb05
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devtools/client/shared/view-source.js
View File

@ -62,7 +62,7 @@ exports.viewSourceInDebugger = Task.async(function* (toolbox, sourceURL, sourceL
yield toolbox.selectTool("jsdebugger");
// TODO: Properly handle case where source will never exist in the
// debugger
dbg.actions.selectSourceURL(sourceURL);
dbg.actions.selectSourceURL(sourceURL, { line: sourceLine });
return true;
}

3
toolkit/modules/FinderHighlighter.jsm
View File

@ -869,7 +869,8 @@ FinderHighlighter.prototype = {
rectCount != 1);
dict.previousRangeRectsCount = rectCount;
let document = range.startContainer.ownerDocument;
let window = range.startContainer.ownerDocument.defaultView.top;
let document = window.document;
// First see if we need to and can remove the previous outline nodes.
if (rebuildOutline && outlineAnonNode) {
if (kDebug) {