Disable OMTP only if edge padding is enabled and tiling is also enabled (
bug 1424325, r=bas)
MozReview-Commit-ID: K1B7kTCMDDt
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -2583,17 +2583,17 @@ gfxPlatform::InitOMTPConfig()
if (mContentBackend == BackendType::CAIRO) {
omtp.ForceDisable(FeatureStatus::Broken, "OMTP is not supported when using cairo",
NS_LITERAL_CSTRING("FEATURE_FAILURE_COMP_PREF"));
}
if (InSafeMode()) {
omtp.ForceDisable(FeatureStatus::Blocked, "OMTP blocked by safe-mode",
NS_LITERAL_CSTRING("FEATURE_FAILURE_COMP_SAFEMODE"));
- } else if (gfxPrefs::TileEdgePaddingEnabled()) {
+ } else if (gfxPrefs::LayersTilesEnabled() && gfxPrefs::TileEdgePaddingEnabled()) {
omtp.ForceDisable(FeatureStatus::Blocked, "OMTP does not yet support tiling with edge padding",
NS_LITERAL_CSTRING("FEATURE_FAILURE_OMTP_TILING"));
}
if (omtp.IsEnabled()) {
gfxVars::SetUseOMTP(true);
reporter.SetSuccessful();
}