Bug 616134 - Content processes should annotate URLs for crashes. r=felipe.

This commit is contained in:
Mike Conley 2014-05-17 12:39:14 -04:00
parent b35189dfe7
commit 00f236ed86
2 changed files with 11 additions and 1 deletions

View File

@ -11,6 +11,12 @@ Cu.import('resource://gre/modules/XPCOMUtils.jsm');
Cu.import("resource://gre/modules/RemoteAddonsChild.jsm"); Cu.import("resource://gre/modules/RemoteAddonsChild.jsm");
Cu.import("resource://gre/modules/Timer.jsm"); Cu.import("resource://gre/modules/Timer.jsm");
#ifdef MOZ_CRASHREPORTER
XPCOMUtils.defineLazyServiceGetter(this, "CrashReporter",
"@mozilla.org/xre/app-info;1",
"nsICrashReporter");
#endif
let FocusSyncHandler = { let FocusSyncHandler = {
init: function() { init: function() {
sendAsyncMessage("SetSyncHandler", {}, {handler: this}); sendAsyncMessage("SetSyncHandler", {}, {handler: this});
@ -178,6 +184,10 @@ let WebNavigation = {
}, },
loadURI: function(uri, flags) { loadURI: function(uri, flags) {
#ifdef MOZ_CRASHREPORTER
if (CrashReporter.enabled)
CrashReporter.annotateCrashReport("URL", uri);
#endif
this._webNavigation.loadURI(uri, flags, null, null, null); this._webNavigation.loadURI(uri, flags, null, null, null);
}, },

View File

@ -27,7 +27,7 @@ toolkit.jar:
content/global/directionDetector.html content/global/directionDetector.html
content/global/plugins.html content/global/plugins.html
content/global/plugins.css content/global/plugins.css
content/global/browser-child.js (browser-child.js) * content/global/browser-child.js (browser-child.js)
content/global/browser-content.js (browser-content.js) content/global/browser-content.js (browser-content.js)
*+ content/global/buildconfig.html (buildconfig.html) *+ content/global/buildconfig.html (buildconfig.html)
* content/global/contentAreaUtils.js (contentAreaUtils.js) * content/global/contentAreaUtils.js (contentAreaUtils.js)