diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc index a05ce6ac2..34e4171b3 100644 --- a/browser/base/content/browser-context.inc +++ b/browser/base/content/browser-context.inc @@ -118,27 +118,33 @@ + diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js index 98394b802..edc8d78ae 100644 --- a/browser/base/content/nsContextMenu.js +++ b/browser/base/content/nsContextMenu.js @@ -525,6 +525,7 @@ nsContextMenu.prototype = { if (onMedia) { this.setItemAttr("context-media-playbackrate-050x", "checked", this.target.playbackRate == 0.5); this.setItemAttr("context-media-playbackrate-100x", "checked", this.target.playbackRate == 1.0); + this.setItemAttr("context-media-playbackrate-125x", "checked", this.target.playbackRate == 1.25); this.setItemAttr("context-media-playbackrate-150x", "checked", this.target.playbackRate == 1.5); this.setItemAttr("context-media-playbackrate-200x", "checked", this.target.playbackRate == 2.0); var hasError = this.target.error != null || @@ -536,6 +537,7 @@ nsContextMenu.prototype = { this.setItemAttr("context-media-playbackrate", "disabled", hasError); this.setItemAttr("context-media-playbackrate-050x", "disabled", hasError); this.setItemAttr("context-media-playbackrate-100x", "disabled", hasError); + this.setItemAttr("context-media-playbackrate-125x", "disabled", hasError); this.setItemAttr("context-media-playbackrate-150x", "disabled", hasError); this.setItemAttr("context-media-playbackrate-200x", "disabled", hasError); this.setItemAttr("context-media-showcontrols", "disabled", hasError); diff --git a/browser/base/content/test/general/test_contextmenu.html b/browser/base/content/test/general/test_contextmenu.html index e830da303..c60b8e651 100644 --- a/browser/base/content/test/general/test_contextmenu.html +++ b/browser/base/content/test/general/test_contextmenu.html @@ -173,6 +173,7 @@ function runTest(testNum) { "context-media-playbackrate", null, ["context-media-playbackrate-050x", true, "context-media-playbackrate-100x", true, + "context-media-playbackrate-125x", true, "context-media-playbackrate-150x", true, "context-media-playbackrate-200x", true], null, "context-media-hidecontrols", true, @@ -199,6 +200,7 @@ function runTest(testNum) { "context-media-playbackrate", null, ["context-media-playbackrate-050x", true, "context-media-playbackrate-100x", true, + "context-media-playbackrate-125x", true, "context-media-playbackrate-150x", true, "context-media-playbackrate-200x", true], null, "context-media-showcontrols", true, @@ -219,6 +221,7 @@ function runTest(testNum) { "context-media-playbackrate", null, ["context-media-playbackrate-050x", false, "context-media-playbackrate-100x", false, + "context-media-playbackrate-125x", false, "context-media-playbackrate-150x", false, "context-media-playbackrate-200x", false], null, "context-media-hidecontrols", false, @@ -245,6 +248,7 @@ function runTest(testNum) { "context-media-playbackrate", null, ["context-media-playbackrate-050x", false, "context-media-playbackrate-100x", false, + "context-media-playbackrate-125x", false, "context-media-playbackrate-150x", false, "context-media-playbackrate-200x", false], null, "context-media-hidecontrols", false, @@ -305,6 +309,7 @@ function runTest(testNum) { "context-media-playbackrate", null, ["context-media-playbackrate-050x", true, "context-media-playbackrate-100x", true, + "context-media-playbackrate-125x", true, "context-media-playbackrate-150x", true, "context-media-playbackrate-200x", true], null, "context-media-hidecontrols", true, diff --git a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm index f279fc812..d431ea785 100644 --- a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm +++ b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm @@ -362,7 +362,7 @@ ChromeActions.prototype = { supportsDocumentFonts: function() { var prefBrowser = getIntPref('browser.display.use_document_fonts', 1); var prefGfx = getBoolPref('gfx.downloadable_fonts.enabled', true); - return (!!prefBrowser && prefGfx); + return (!!prefBrowser && prefGfx && getBoolPref('pdfjs.display.use_document_fonts', true)); }, supportsDocumentColors: function() { if (getIntPref('browser.display.document_color_use', 0) === 2 || diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd index 4485b5b36..09b6d3678 100644 --- a/browser/locales/en-US/chrome/browser/browser.dtd +++ b/browser/locales/en-US/chrome/browser/browser.dtd @@ -635,17 +635,19 @@ items are mutually exclusive. --> - - - - - - - - - + + diff --git a/browser/modules/BrowserUITelemetry.jsm b/browser/modules/BrowserUITelemetry.jsm index 48b22afc7..272cdfbe2 100644 --- a/browser/modules/BrowserUITelemetry.jsm +++ b/browser/modules/BrowserUITelemetry.jsm @@ -661,7 +661,7 @@ this.BrowserUITelemetry = { "marklinkMenu", "copyemail", "copylink", "media-play", "media-pause", "media-mute", "media-unmute", "media-playbackrate", "media-playbackrate-050x", "media-playbackrate-100x", - "media-playbackrate-150x", "media-playbackrate-200x", + "media-playbackrate-125x", "media-playbackrate-150x", "media-playbackrate-200x", "media-showcontrols", "media-hidecontrols", "video-showstats", "video-hidestats", "video-fullscreen", "leave-dom-fullscreen", "reloadimage", "viewimage", "viewvideo", "copyimage-contents", "copyimage", diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 025c798a9..fe1ab1526 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -637,6 +637,7 @@ pref("gfx.color_management.enablev4", true); pref("gfx.downloadable_fonts.enabled", true); pref("gfx.downloadable_fonts.fallback_delay", 3000); +pref("pdfjs.display.use_document_fonts", true); // disable downloadable font cache so that behavior is consistently // the uncached load behavior across pages (useful for testing reflow problems)