Bug 1385070 - Remove the WebRenderOMTAEnabled pref. r?ethlin
MozReview-Commit-ID: CWdrpzorNxq
--- a/gfx/layers/wr/WebRenderBridgeParent.cpp
+++ b/gfx/layers/wr/WebRenderBridgeParent.cpp
@@ -1105,22 +1105,19 @@ WebRenderBridgeParent::CompositeToTarget
bool scheduleComposite = false;
nsTArray<wr::WrOpacityProperty> opacityArray;
nsTArray<wr::WrTransformProperty> transformArray;
mCompositableHolder->SetCompositionTime(TimeStamp::Now());
mCompositableHolder->ApplyAsyncImages(mApi);
- if (gfxPrefs::WebRenderOMTAEnabled()) {
- SampleAnimations(opacityArray, transformArray);
-
- if (!transformArray.IsEmpty() || !opacityArray.IsEmpty()) {
- scheduleComposite = true;
- }
+ SampleAnimations(opacityArray, transformArray);
+ if (!transformArray.IsEmpty() || !opacityArray.IsEmpty()) {
+ scheduleComposite = true;
}
if (PushAPZStateToWR(transformArray)) {
scheduleComposite = true;
}
wr::RenderThread::Get()->IncPendingFrameCount(mApi->GetId());
--- a/gfx/layers/wr/WebRenderContainerLayer.cpp
+++ b/gfx/layers/wr/WebRenderContainerLayer.cpp
@@ -38,18 +38,17 @@ WebRenderContainerLayer::RenderLayer(wr:
nsTArray<LayerPolygon> children = SortChildrenBy3DZOrder(SortMode::WITHOUT_GEOMETRY);
gfx::Matrix4x4 transform = GetTransform();
gfx::Matrix4x4* transformForSC = &transform;
float opacity = GetLocalOpacity();
float* opacityForSC = &opacity;
uint64_t animationsId = 0;
- if (gfxPrefs::WebRenderOMTAEnabled() &&
- !GetAnimations().IsEmpty()) {
+ if (!GetAnimations().IsEmpty()) {
MOZ_ASSERT(GetCompositorAnimationsId());
OptionalOpacity opacityForCompositor = void_t();
OptionalTransform transformForCompositor = void_t();
// Update opacity as nullptr in stacking context if there exists
// opacity animation, the opacity value will be resolved
// after animation sampling on the compositor
--- a/gfx/layers/wr/WebRenderContainerLayer.h
+++ b/gfx/layers/wr/WebRenderContainerLayer.h
@@ -22,19 +22,17 @@ public:
: ContainerLayer(aManager, static_cast<WebRenderLayer*>(this))
{
MOZ_COUNT_CTOR(WebRenderContainerLayer);
}
protected:
virtual ~WebRenderContainerLayer()
{
-
- if (gfxPrefs::WebRenderOMTAEnabled() &&
- !GetAnimations().IsEmpty()) {
+ if (!GetAnimations().IsEmpty()) {
mManager->AsWebRenderLayerManager()->
AddCompositorAnimationsIdForDiscard(GetCompositorAnimationsId());
}
ContainerLayer::RemoveAllChildren();
MOZ_COUNT_DTOR(WebRenderContainerLayer);
}
--- a/gfx/thebes/gfxPrefs.h
+++ b/gfx/thebes/gfxPrefs.h
@@ -476,17 +476,16 @@ private:
DECL_GFX_PREF(Once, "gfx.touch.resample.delay-threshold", TouchResampleVsyncDelayThreshold, int32_t, 20);
DECL_GFX_PREF(Once, "gfx.touch.resample.max-predict", TouchResampleMaxPredict, int32_t, 8);
DECL_GFX_PREF(Once, "gfx.touch.resample.min-delta", TouchResampleMinDelta, int32_t, 2);
DECL_GFX_PREF(Once, "gfx.touch.resample.old-touch-threshold",TouchResampleOldTouchThreshold, int32_t, 17);
DECL_GFX_PREF(Once, "gfx.touch.resample.vsync-adjust", TouchVsyncSampleAdjust, int32_t, 5);
DECL_GFX_PREF(Live, "gfx.vsync.collect-scroll-transforms", CollectScrollTransforms, bool, false);
DECL_GFX_PREF(Once, "gfx.vsync.compositor.unobserve-count", CompositorUnobserveCount, int32_t, 10);
- DECL_OVERRIDE_PREF(Live, "gfx.webrender.omta.enabled", WebRenderOMTAEnabled, gfxPrefs::OverrideBase_WebRender());
DECL_GFX_PREF(Live, "gfx.webrender.profiler.enabled", WebRenderProfilerEnabled, bool, false);
DECL_GFX_PREF(Live, "gfx.webrender.layers-free", WebRenderLayersFree, bool, false);
DECL_GFX_PREF(Live, "gfx.webrendest.enabled", WebRendestEnabled, bool, false);
// Use vsync events generated by hardware
DECL_GFX_PREF(Once, "gfx.work-around-driver-bugs", WorkAroundDriverBugs, bool, true);
DECL_GFX_PREF(Once, "gfx.screen-mirroring.enabled", ScreenMirroringEnabled, bool, false);
DECL_GFX_PREF(Live, "gl.ignore-dx-interop2-blacklist", IgnoreDXInterop2Blacklist, bool, false);
--- a/layout/painting/nsDisplayList.cpp
+++ b/layout/painting/nsDisplayList.cpp
@@ -6122,18 +6122,17 @@ nsDisplayOpacity::CreateWebRenderCommand
RefPtr<WebRenderAnimationData> animationData = aManager->CreateOrRecycleWebRenderUserData<WebRenderAnimationData>(this);
AnimationInfo& animationInfo = animationData->GetAnimationInfo();
AddAnimationsForProperty(Frame(), aDisplayListBuilder,
this, eCSSProperty_opacity,
animationInfo, false);
animationInfo.StartPendingAnimations(aManager->GetAnimationReadyTime());
uint64_t animationsId = 0;
- if (gfxPrefs::WebRenderOMTAEnabled() &&
- !animationInfo.GetAnimations().IsEmpty()) {
+ if (!animationInfo.GetAnimations().IsEmpty()) {
animationsId = animationInfo.GetCompositorAnimationsId();
opacityForSC = nullptr;
OptionalOpacity opacityForCompositor = mOpacity;
OpAddCompositorAnimations
anim(CompositorAnimations(animationInfo.GetAnimations(), animationsId),
void_t(), opacityForCompositor);
aManager->WrBridge()->AddWebRenderParentCommand(anim);
@@ -7715,18 +7714,17 @@ nsDisplayTransform::CreateWebRenderComma
AnimationInfo& animationInfo = animationData->GetAnimationInfo();
AddAnimationsForProperty(Frame(), aDisplayListBuilder,
this, eCSSProperty_transform,
animationInfo, false);
animationInfo.StartPendingAnimations(aManager->GetAnimationReadyTime());
uint64_t animationsId = 0;
- if (gfxPrefs::WebRenderOMTAEnabled() &&
- !animationInfo.GetAnimations().IsEmpty()) {
+ if (!animationInfo.GetAnimations().IsEmpty()) {
animationsId = animationInfo.GetCompositorAnimationsId();
// Update transfrom as nullptr in stacking context if there exists
// transform animation, the transform value will be resolved
// after animation sampling on the compositor
transformForSC = nullptr;
// Pass default transform to compositor in case gecko fails to