Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1294509 - Enable browser_thumbnails_bg_crash_during_capture.js on e10s. r=markh

Browse Source 
MozReview-Commit-ID: 6cVbhXWdS0X
This commit is contained in:
Drew Willcoxon 2016-08-11 20:12:38 -07:00
parent b3d4a2a542
commit c1331f5412
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
toolkit/components/thumbnails/BackgroundPageThumbs.jsm
View File

@ -229,8 +229,16 @@ const BackgroundPageThumbs = {
// "resetting" the capture requires more work - so for now, we just
// discard it.
if (curCapture && curCapture.pending) {
curCapture._done(null, TEL_CAPTURE_DONE_CRASHED);
// _done automatically continues queue processing.
// Continue queue processing by calling curCapture._done(). Do it after
// this crashed listener returns, though. A new browser will be created
// immediately (on the same stack as the _done call stack) if there are
// any more queued-up captures, and that seems to mess up the new
// browser's message manager if it happens on the same stack as the
// listener. Trying to send a message to the manager in that case
// throws NS_ERROR_NOT_INITIALIZED.
Services.tm.currentThread.dispatch(() => {
curCapture._done(null, TEL_CAPTURE_DONE_CRASHED);
}, Ci.nsIEventTarget.DISPATCH_NORMAL);
}
// else: we must have been idle and not currently doing a capture (eg,
// maybe a GC or similar crashed) - so there's no need to attempt a

2
toolkit/components/thumbnails/test/browser.ini
View File

@ -12,7 +12,7 @@ support-files =
[browser_thumbnails_bg_bad_url.js]
[browser_thumbnails_bg_crash_during_capture.js]
skip-if = buildapp == 'mulet' || !crashreporter || e10s # crashing the remote thumbnailer crashes the remote test tab
skip-if = buildapp == 'mulet' || !crashreporter
[browser_thumbnails_bg_crash_while_idle.js]
skip-if = buildapp == 'mulet' || !crashreporter
[browser_thumbnails_bg_basic.js]