From 8069f421a8e5df16f67eb752f18a6aa642266059 Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Sun, 7 May 2017 21:05:20 -0400 Subject: [PATCH] Backout bug 1362120 because of build failures --- gfx/thebes/gfxPlatform.cpp | 4 +--- layout/style/nsCSSParser.cpp | 11 ++--------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp index af872be73e70..ae66945956f9 100644 --- a/gfx/thebes/gfxPlatform.cpp +++ b/gfx/thebes/gfxPlatform.cpp @@ -1612,9 +1612,7 @@ gfxPlatform::OpenTypeSVGEnabled() Preferences::GetBool(GFX_PREF_OPENTYPE_SVG, false); } - return mOpenTypeSVGEnabled > 0 || - // is e10s parent process: - (XRE_IsParentProcess() && BrowserTabsRemoteAutostart()); + return mOpenTypeSVGEnabled > 0; } uint32_t diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp index 62bf79707f04..f400bf29c9e0 100644 --- a/layout/style/nsCSSParser.cpp +++ b/layout/style/nsCSSParser.cpp @@ -24,7 +24,6 @@ #include "nsCSSProps.h" #include "nsCSSKeywords.h" #include "nsCSSScanner.h" -#include "nsXULAppAPI.h" #include "mozilla/css/ErrorReporter.h" #include "mozilla/css/Loader.h" #include "mozilla/css/StyleRule.h" @@ -17917,14 +17916,8 @@ static CSSParserImpl* gFreeList = nullptr; /* static */ void nsCSSParser::Startup() { - const bool isE10sParent = XRE_IsParentProcess() && BrowserTabsRemoteAutostart(); - - if (isE10sParent) { - sOpentypeSVGEnabled = true; - } else { - Preferences::AddBoolVarCache(&sOpentypeSVGEnabled, - "gfx.font_rendering.opentype_svg.enabled"); - } + Preferences::AddBoolVarCache(&sOpentypeSVGEnabled, + "gfx.font_rendering.opentype_svg.enabled"); Preferences::AddBoolVarCache(&sWebkitPrefixedAliasesEnabled, "layout.css.prefixes.webkit"); Preferences::AddBoolVarCache(&sWebkitDevicePixelRatioEnabled,