зеркало из https://github.com/mozilla/pjs.git
Bug 387995, don't _repeatedly_ try to use Breakpad if it wasn't built, Patch by Simon B��nzli, r=gavin
This commit is contained in:
Родитель
08395202ff
Коммит
b3ed91b38d
|
@ -355,8 +355,6 @@ SessionStoreService.prototype = {
|
||||||
this.onTabLoad(aEvent.currentTarget.ownerDocument.defaultView, aEvent.currentTarget, aEvent);
|
this.onTabLoad(aEvent.currentTarget.ownerDocument.defaultView, aEvent.currentTarget, aEvent);
|
||||||
break;
|
break;
|
||||||
case "input":
|
case "input":
|
||||||
this.onTabInput(aEvent.currentTarget.ownerDocument.defaultView, aEvent.currentTarget, aEvent);
|
|
||||||
break;
|
|
||||||
case "DOMAutoComplete":
|
case "DOMAutoComplete":
|
||||||
this.onTabInput(aEvent.currentTarget.ownerDocument.defaultView, aEvent.currentTarget, aEvent);
|
this.onTabInput(aEvent.currentTarget.ownerDocument.defaultView, aEvent.currentTarget, aEvent);
|
||||||
break;
|
break;
|
||||||
|
@ -1883,15 +1881,17 @@ SessionStoreService.prototype = {
|
||||||
* Annotate a breakpad crash report with the currently selected tab's URL.
|
* Annotate a breakpad crash report with the currently selected tab's URL.
|
||||||
*/
|
*/
|
||||||
_updateCrashReportURL: function sss_updateCrashReportURL(aWindow) {
|
_updateCrashReportURL: function sss_updateCrashReportURL(aWindow) {
|
||||||
var currentUrl = aWindow.getBrowser().currentURI.spec;
|
if (!Ci.nsICrashReporter) {
|
||||||
try {
|
// if breakpad isn't built, don't bother next time at all
|
||||||
var cr = Cc["@mozilla.org/xre/app-info;1"].
|
this._updateCrashReportURL = function(aWindow) {};
|
||||||
getService(Ci.nsICrashReporter);
|
return;
|
||||||
cr.annotateCrashReport("URL", currentUrl);
|
}
|
||||||
}
|
try {
|
||||||
catch (ex) {
|
var currentUrl = aWindow.getBrowser().currentURI.spec;
|
||||||
// if breakpad isn't built, we can't annotate the report
|
var cr = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsICrashReporter);
|
||||||
}
|
cr.annotateCrashReport("URL", currentUrl);
|
||||||
|
}
|
||||||
|
catch (ex) { debug(ex); }
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Загрузка…
Ссылка в новой задаче