Backout bug 1362120 because of build failures
authorEhsan Akhgari <ehsan@mozilla.com>
Sun, 07 May 2017 21:05:20 -0400
changeset 356999 6086ceba2e8c787768266479d694806725e90add
parent 356998 bd9b7b29f95690ab9c3aacd7864206c68509fa8d
child 357000 98d1dd932bc67a9121fdec38aebe800f11a4a3e4
push id31778
push usercbook@mozilla.com
push dateMon, 08 May 2017 08:07:41 +0000
treeherdermozilla-central@1fda52a1f3b8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1362120
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backout bug 1362120 because of build failures
gfx/thebes/gfxPlatform.cpp
layout/style/nsCSSParser.cpp
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -1607,19 +1607,17 @@ gfxPlatform::UseCmapsDuringSystemFallbac
 bool
 gfxPlatform::OpenTypeSVGEnabled()
 {
     if (mOpenTypeSVGEnabled == UNINITIALIZED_VALUE) {
         mOpenTypeSVGEnabled =
             Preferences::GetBool(GFX_PREF_OPENTYPE_SVG, false);
     }
 
-    return mOpenTypeSVGEnabled > 0 ||
-           // is e10s parent process:
-           (XRE_IsParentProcess() && BrowserTabsRemoteAutostart());
+    return mOpenTypeSVGEnabled > 0;
 }
 
 uint32_t
 gfxPlatform::WordCacheCharLimit()
 {
     if (mWordCacheCharLimit == UNINITIALIZED_VALUE) {
         mWordCacheCharLimit =
             Preferences::GetInt(GFX_PREF_WORD_CACHE_CHARLIMIT, 32);
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -19,17 +19,16 @@
 
 #include <algorithm> // for std::stable_sort
 #include <limits> // for std::numeric_limits
 
 #include "nsAlgorithm.h"
 #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"
 #include "mozilla/css/ImportRule.h"
 #include "nsCSSRules.h"
 #include "nsCSSFontFaceRule.h"
 #include "mozilla/css/NameSpaceRule.h"
 #include "nsTArray.h"
@@ -17912,24 +17911,18 @@ CSSParserImpl::IsValueValidForProperty(c
 
 // Recycling of parser implementation objects
 
 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,
                                "layout.css.prefixes.device-pixel-ratio-webkit");
   Preferences::AddBoolVarCache(&sMozGradientsEnabled,
                                "layout.css.prefixes.gradients");
   Preferences::AddBoolVarCache(&sControlCharVisibility,
                                "layout.css.control-characters.visible");