Merge pull request #5511 from gijsk/patch-1

Bug 639134 - update check for document colors
2015-01-22 20:43:50 +01:00 · 2015-01-22 20:43:50 +01:00 · 8389f1d792
commit 8389f1d792
parent 385b07c2ab 1d674d3e8f
1 changed files with 5 additions and 1 deletions
--- a/extensions/firefox/content/PdfStreamConverter.jsm
+++ b/extensions/firefox/content/PdfStreamConverter.jsm
@ -381,7 +381,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);