commit abff9655e7e5fc87c78fb6dd2a99dab494971cee Author: Georg Koppen gk@torproject.org Date: Mon Jun 13 07:49:59 2016 +0000

fixup! Bug #15502. Isolate blob, mediasource & mediastream URLs to first party

This fixes bug 19401 which is caused by a rebase error we overlooked. --- browser/extensions/pdfjs/content/PdfStreamConverter.jsm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm index d68c940..e6ef8e1 100644 --- a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm +++ b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm @@ -264,9 +264,9 @@ ChromeActions.prototype = { var docIsPrivate = this.isInPrivateBrowsing(); var netChannel; try { - netChannel = NetUtil.createNewChannel(blobUri, frontWindow.document, null); + netChannel = createNewChannel(blobUri, frontWindow.document, null); } catch (e) { - netChannel = NetUtil.createNewChannel(originalUri, frontWindow.document, null); + netChannel = createNewChannel(originalUri, frontWindow.document, null); } if ('nsIPrivateBrowsingChannel' in Ci && netChannel instanceof Ci.nsIPrivateBrowsingChannel) {