Bug 1049564. Backout unintentionally landed code.

CLOSED TREE
This commit is contained in:
Jeff Muizelaar 2014-09-08 11:07:48 -04:00
parent 6458e7d04e
commit cd088d907b
3 changed files with 2 additions and 13 deletions

View File

@ -95,7 +95,6 @@ struct PointTyped :
}
};
typedef PointTyped<UnknownUnits> Point;
static_assert(sizeof(Point) == 2*sizeof(Float));
template<class units>
IntPointTyped<units> RoundedToInt(const PointTyped<units>& aPoint) {

View File

@ -122,9 +122,9 @@ void
AsyncCompositionManager::ComputeRotation()
{
if (!mTargetConfig.naturalBounds().IsEmpty()) {
mWorldTransform =
mLayerManager->SetWorldTransform(
ComputeTransformForRotation(mTargetConfig.naturalBounds(),
mTargetConfig.rotation());
mTargetConfig.rotation()));
}
}
@ -939,7 +939,6 @@ AsyncCompositionManager::TransformShadowTree(TimeStamp aCurrentFrame)
return false;
}
// NB: we must sample animations *before* sampling pan/zoom
// transforms.
bool wantNextFrame = SampleAnimations(root, aCurrentFrame);
@ -977,13 +976,6 @@ AsyncCompositionManager::TransformShadowTree(TimeStamp aCurrentFrame)
}
}
LayerComposite* rootComposite = root->AsLayerComposite();
gfx::Matrix4x4 trans = rootComposite->GetShadowTransform();
trans *= gfx::Matrix4x4::From2D(mWorldTransform);
rootComposite->SetShadowTransform(trans);
return wantNextFrame;
}

View File

@ -204,8 +204,6 @@ private:
bool mLayersUpdated;
bool mReadyForCompose;
gfx::Matrix mWorldTransform;
};
class MOZ_STACK_CLASS AutoResolveRefLayers {