diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-09-04 20:53:31 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-09-04 20:53:31 +0200 |
| commit | 580084e9e1d0355c96a54a9641df6c1fee894948 (patch) | |
| tree | 5aff416b5aed2ca9e326054567d837f28c20ed25 /toolkit/components/thumbnails/PageThumbs.jsm | |
| parent | fc61780b35af913801d72086456f493f63197da6 (diff) | |
| parent | b28ab55f9675f2e97dda9a4fcac0d4f5267a2bb9 (diff) | |
| download | UXP-580084e9e1d0355c96a54a9641df6c1fee894948.tar UXP-580084e9e1d0355c96a54a9641df6c1fee894948.tar.gz UXP-580084e9e1d0355c96a54a9641df6c1fee894948.tar.lz UXP-580084e9e1d0355c96a54a9641df6c1fee894948.tar.xz UXP-580084e9e1d0355c96a54a9641df6c1fee894948.zip | |
Merge branch 'master' into Basilisk-releasev2018.09.05
Diffstat (limited to 'toolkit/components/thumbnails/PageThumbs.jsm')
| -rw-r--r-- | toolkit/components/thumbnails/PageThumbs.jsm | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/toolkit/components/thumbnails/PageThumbs.jsm b/toolkit/components/thumbnails/PageThumbs.jsm index 9bd3ae4b3..5c7754b31 100644 --- a/toolkit/components/thumbnails/PageThumbs.jsm +++ b/toolkit/components/thumbnails/PageThumbs.jsm @@ -28,6 +28,9 @@ const MAX_THUMBNAIL_AGE_SECS = 172800; // 2 days == 60*60*24*2 == 172800 secs. */ const THUMBNAIL_DIRECTORY = "thumbnails"; +// contains base64 version of a placeholder thumbnail +#include blankthumb.inc + Cu.import("resource://gre/modules/XPCOMUtils.jsm", this); Cu.import("resource://gre/modules/PromiseWorker.jsm", this); Cu.import("resource://gre/modules/Promise.jsm", this); @@ -609,7 +612,15 @@ this.PageThumbsStorage = { writeData: function Storage_writeData(aURL, aData, aNoOverwrite) { let path = this.getFilePathForURL(aURL); this.ensurePath(); - aData = new Uint8Array(aData); + + // XXX: We try/catch here since 'null' isn't accepted until we implement + // ES2017's new Uint8Array(); allowance. + try { + aData = new Uint8Array(aData); + } catch(e) { + aData = new Uint8Array(0); + } + let msg = [ path, aData, |