From 86d650be8c0fcefd5e0b27d4c90d48d2463b39b3 Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Tue, 28 Jan 2014 14:03:38 +0100 Subject: [PATCH] Backed out changeset a76a4f921987 (bug 964700) for XPC Bustage on a CLOSED TREE --- browser/devtools/shared/Parser.jsm | 9 +++------ toolkit/devtools/DevToolsUtils.js | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/browser/devtools/shared/Parser.jsm b/browser/devtools/shared/Parser.jsm index 1e95cb34ddd9..6807374bf8f4 100644 --- a/browser/devtools/shared/Parser.jsm +++ b/browser/devtools/shared/Parser.jsm @@ -85,7 +85,7 @@ Parser.prototype = { } } - let pool = new SyntaxTreesPool(syntaxTrees, aUrl); + let pool = new SyntaxTreesPool(syntaxTrees); // Cache the syntax trees pool by the specified url. This is entirely // optional, but it's strongly encouraged to cache ASTs because @@ -123,12 +123,9 @@ Parser.prototype = { * * @param object aSyntaxTrees * A collection of AST nodes generated for a source. - * @param string aUrl [optional] - * The source url. */ -function SyntaxTreesPool(aSyntaxTrees, aUrl = "") { +function SyntaxTreesPool(aSyntaxTrees) { this._trees = aSyntaxTrees; - this._url = aUrl; this._cache = new Map(); } @@ -218,7 +215,7 @@ SyntaxTreesPool.prototype = { // Can't guarantee that the tree traversal logic is forever perfect :) // Language features may be added, in which case the recursive methods // need to be updated. If an exception is thrown here, file a bug. - DevToolsUtils.reportException("Syntax tree visitor for " + aUrl, e); + DevToolsUtils.reportException("syntax tree", e); } } this._cache.set(requestId, results); diff --git a/toolkit/devtools/DevToolsUtils.js b/toolkit/devtools/DevToolsUtils.js index 4dfa477b9034..30fc8f88f715 100644 --- a/toolkit/devtools/DevToolsUtils.js +++ b/toolkit/devtools/DevToolsUtils.js @@ -29,7 +29,7 @@ this.safeErrorString = function safeErrorString(aError) { } catch (ee) { } if (typeof aError.lineNumber == "number" && typeof aError.columnNumber == "number") { - errorString += "Line: " + aError.lineNumber + ", column: " + aError.columnNumber; + errorString += ", line: " + aError.lineNumber + ", column: " + aError.columnNumber; } return errorString;