commit d29914da189fb07c8beddf170e25681b25a211e3 Author: Georg Koppen gk@torproject.org Date: Tue Mar 15 20:55:06 2016 +0000

Bug 18557: Exempt graphite from the security slider

We follow Mozilla's handling of the graphite library and apply it to all security slider levels. --- src/chrome/content/preferences.xul | 4 ++-- src/chrome/content/torbutton.js | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index dfc0f2e..60a214b 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -217,7 +217,7 @@ &torbutton.prefs.sec_mathml_desc; </description> <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_font_rend_svg_tooltip; &torbutton.prefs.sec_font_rend_graphite_tooltip;"> + tooltiptext="&torbutton.prefs.sec_font_rend_svg_tooltip;"> &torbutton.prefs.sec_font_rend_desc; </description> <description class="slider-text-size" @@ -255,7 +255,7 @@ &torbutton.prefs.sec_mathml_desc; </description> <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_font_rend_svg_tooltip; &torbutton.prefs.sec_font_rend_graphite_tooltip;"> + tooltiptext="&torbutton.prefs.sec_font_rend_svg_tooltip;"> &torbutton.prefs.sec_font_rend_desc; </description> <description class="slider-text-size" diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 63d3493..03a3b56 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -253,7 +253,6 @@ var torbutton_unique_pref_observer = case "mathml.disabled": case "javascript.options.baselinejit.content": case "noscript.forbidFonts": - case "gfx.font_rendering.graphite.enabled": case "noscript.globalHttpsWhitelist": case "noscript.global": case "svg.in-content.enabled": @@ -2327,7 +2326,6 @@ var torbutton_sec_ml_bool_prefs = {

var torbutton_sec_mh_bool_prefs = { "javascript.options.baselinejit.content" : false, - "gfx.font_rendering.graphite.enabled" : false, "gfx.font_rendering.opentype_svg.enabled" : false, "noscript.global" : false, "noscript.globalHttpsWhitelist" : true