[tbb-commits] [torbutton/maint-1.9.4] Bug 18557: Exempt graphite from the security slider

[gk at torproject.org]

commit 8effc7ae7b20e7278c24999823736f6e09d4aba4
Author: Georg Koppen <gk at 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 bf45fea..7e106da 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -250,7 +250,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":
@@ -2295,7 +2294,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