Backout bug 1362120 because of build failures

This commit is contained in:
Ehsan Akhgari 2017-05-07 21:05:20 -04:00
parent 1e3498af1e
commit 8069f421a8
2 changed files with 3 additions and 12 deletions

View File

@ -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

View File

@ -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,