Backed out changeset 43e4b01c0150 (bug 810186) for reftest failures.

This commit is contained in:
Ryan VanderMeulen 2012-11-13 18:25:09 -05:00
parent 3a06bc4b4f
commit ebd6964397

View File

@ -2052,7 +2052,6 @@ ContainerState::ProcessDisplayItems(const nsDisplayList& aList,
// Assign the item to a layer
if (layerState == LAYER_ACTIVE_FORCE ||
(layerState == LAYER_INACTIVE && !mManager->IsWidgetLayerManager()) ||
(!forceInactive &&
(layerState == LAYER_ACTIVE_EMPTY ||
layerState == LAYER_ACTIVE))) {
@ -2697,7 +2696,7 @@ ChooseScaleAndSetTransform(FrameLayerBuilder* aLayerBuilder,
gfxMatrix transform2d;
bool canDraw2D = transform.CanDraw2D(&transform2d);
gfxSize scale;
bool isRetained = aLayer->Manager()->IsWidgetLayerManager();
bool isRetained = aLayerBuilder->GetRetainingLayerManager() == aLayer->Manager();
// Only fiddle with scale factors for the retaining layer manager, since
// it only matters for retained layers
// XXX Should we do something for 3D transforms?