From 2aa1e3acd924edb1d27de811c4082905e036bba6 Mon Sep 17 00:00:00 2001 From: Anthony Jones Date: Sun, 23 Dec 2012 10:47:16 -0500 Subject: [PATCH] Bug 811950 - Remove fixed position environment variable. r=roc, a=overholt --- gfx/layers/ipc/ShadowLayersParent.cpp | 7 ++----- layout/base/nsDisplayList.cpp | 7 ++----- mobile/android/base/GeckoAppShell.java | 3 --- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/gfx/layers/ipc/ShadowLayersParent.cpp b/gfx/layers/ipc/ShadowLayersParent.cpp index a856bbb63063..a2c266aeb2f3 100644 --- a/gfx/layers/ipc/ShadowLayersParent.cpp +++ b/gfx/layers/ipc/ShadowLayersParent.cpp @@ -246,11 +246,8 @@ ShadowLayersParent::RecvUpdate(const InfallibleTArray& cset, layer->SetClipRect(common.useClipRect() ? &common.clipRect() : NULL); layer->SetBaseTransform(common.transform().value()); layer->SetPostScale(common.postXScale(), common.postYScale()); - static bool fixedPositionLayersEnabled = getenv("MOZ_ENABLE_FIXED_POSITION_LAYERS") != 0; - if (fixedPositionLayersEnabled) { - layer->SetIsFixedPosition(common.isFixedPosition()); - layer->SetFixedPositionAnchor(common.fixedPositionAnchor()); - } + layer->SetIsFixedPosition(common.isFixedPosition()); + layer->SetFixedPositionAnchor(common.fixedPositionAnchor()); if (PLayerParent* maskLayer = common.maskLayerParent()) { layer->SetMaskLayer(cast(maskLayer)->AsLayer()); } else { diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp index 4af7f27b16dc..1b968126056e 100644 --- a/layout/base/nsDisplayList.cpp +++ b/layout/base/nsDisplayList.cpp @@ -551,11 +551,8 @@ static bool ForceVisiblityForFixedItem(nsDisplayListBuilder* aBuilder, void nsDisplayListBuilder::SetDisplayPort(const nsRect& aDisplayPort) { - static bool fixedPositionLayersEnabled = getenv("MOZ_ENABLE_FIXED_POSITION_LAYERS") != 0; - if (fixedPositionLayersEnabled) { - mHasDisplayPort = true; - mDisplayPort = aDisplayPort; - } + mHasDisplayPort = true; + mDisplayPort = aDisplayPort; } void nsDisplayListBuilder::MarkOutOfFlowFrameForDisplay(nsIFrame* aDirtyFrame, diff --git a/mobile/android/base/GeckoAppShell.java b/mobile/android/base/GeckoAppShell.java index 667f00de9867..e2bb0c5c9266 100644 --- a/mobile/android/base/GeckoAppShell.java +++ b/mobile/android/base/GeckoAppShell.java @@ -425,9 +425,6 @@ public class GeckoAppShell f = Environment.getDownloadCacheDirectory(); GeckoAppShell.putenv("EXTERNAL_STORAGE=" + f.getPath()); - // Enable fixed position layers - GeckoAppShell.putenv("MOZ_ENABLE_FIXED_POSITION_LAYERS=1"); - // setup the app-specific cache path f = context.getCacheDir(); GeckoAppShell.putenv("CACHE_DIRECTORY=" + f.getPath());