From 1d674d3e8f647006805138dd250b30b629e11842 Mon Sep 17 00:00:00 2001 From: Gijs Date: Wed, 26 Nov 2014 23:25:03 +0000 Subject: [PATCH] Bug 639134 - update check for document colors This checks for both prefs on the understanding that we need to work on older versions of Firefox. If that isn't the case, the first part of the if isn't necessary. This should only land if bug 639134 is resolved - I'd make the patch part of that bug, but AIUI pdfjs's canonical repo is on github, so... --- extensions/firefox/content/PdfStreamConverter.jsm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/extensions/firefox/content/PdfStreamConverter.jsm b/extensions/firefox/content/PdfStreamConverter.jsm index 22d114ef5..6c76601ef 100644 --- a/extensions/firefox/content/PdfStreamConverter.jsm +++ b/extensions/firefox/content/PdfStreamConverter.jsm @@ -375,7 +375,11 @@ ChromeActions.prototype = { return (!!prefBrowser && prefGfx); }, supportsDocumentColors: function() { - return getBoolPref('browser.display.use_document_colors', true); + if (getIntPref('browser.display.document_color_use', 0) == 2 || + !getBoolPref('browser.display.use_document_colors', true)) { + return false; + } + return true; }, reportTelemetry: function (data) { var probeInfo = JSON.parse(data);