commit 4029568bb2283ce1203d0cdff0e857f7da8bce42 Author: Mike Perry mikeperry-git@torproject.org Date: Fri Mar 20 19:40:18 2015 -0700

fixup! Bug 12827: Create preference to disable SVG.

Call the pref svg.in-content.enabled. --- browser/app/profile/000-tor-browser.js | 2 +- content/svg/content/src/nsSVGFeatures.cpp | 4 ++-- layout/svg/nsSVGUtils.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index e87ccff..91a5b71 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -116,7 +116,7 @@ pref("plugins.click_to_play", true); pref("plugin.state.flash", 1); pref("plugins.hide_infobar_for_missing_plugin", true); pref("media.peerconnection.enabled", false); // Disable WebRTC interfaces -pref("svg.inContent.enabled", true); // May be disabled via Torbutton's security slider. +pref("svg.in-content.enabled", true); // May be disabled via Torbutton's security slider.

// Network and performance pref("network.http.pipelining", true); diff --git a/content/svg/content/src/nsSVGFeatures.cpp b/content/svg/content/src/nsSVGFeatures.cpp index 04e9917..4348de7 100644 --- a/content/svg/content/src/nsSVGFeatures.cpp +++ b/content/svg/content/src/nsSVGFeatures.cpp @@ -24,7 +24,7 @@ using namespace mozilla; nsSVGFeatures::HasFeature(nsISupports* aObject, const nsAString& aFeature) { // Since we do not have access to the document here we pass nullptr, which - // means only the svg.inContent.enabled pref is checked. This is OK since + // means only the svg.in-content.enabled pref is checked. This is OK since // we do not expect chrome code to use the HasFeature() API. if (!NS_SVGEnabled(nullptr)) return false; @@ -52,7 +52,7 @@ nsSVGFeatures::HasFeature(nsISupports* aObject, const nsAString& aFeature) nsSVGFeatures::HasExtension(const nsAString& aExtension) { // Since we do not have access to the document here we pass nullptr, which - // means only the svg.inContent.enabled pref is checked. This is OK since + // means only the svg.in-content.enabled pref is checked. This is OK since // we do not expect chrome code to use the HasExtension() API. if (!NS_SVGEnabled(nullptr)) return false; diff --git a/layout/svg/nsSVGUtils.cpp b/layout/svg/nsSVGUtils.cpp index da55070..49957fd 100644 --- a/layout/svg/nsSVGUtils.cpp +++ b/layout/svg/nsSVGUtils.cpp @@ -61,7 +61,7 @@ static bool sSVGEnabledInContent; static bool sSVGDisplayListHitTestingEnabled; static bool sSVGDisplayListPaintingEnabled;

-// Determine if SVG should be enabled for aDoc. The svg.inContent.enabled +// Determine if SVG should be enabled for aDoc. The svg.in-content.enabled // preference is checked as well as whether aDoc is a content or chrome doc. // If aChannel is NULL, the pref. value is returned. bool @@ -70,7 +70,7 @@ NS_SVGEnabled(nsIDocument *aDoc) return NS_SVGEnabledForChannel(aDoc ? aDoc->GetChannel() : nullptr); }

-// Determine if SVG should be enabled for aChannel. The svg.inContent.enabled +// Determine if SVG should be enabled for aChannel. The svg.in-content.enabled // preference is checked as well as whether the load context associated with // aChannel is content or chrome. // If aChannel is NULL, the pref. value is returned. @@ -160,7 +160,7 @@ void nsSVGUtils::Init() { Preferences::AddBoolVarCache(&sSVGEnabledInContent, - "svg.inContent.enabled"); + "svg.in-content.enabled");

Preferences::AddBoolVarCache(&sSVGDisplayListHitTestingEnabled, "svg.display-lists.hit-testing.enabled");