Bug 952977: Convert GetEffectiveTransform to gfx::Matrix4x4 r=nical

2014-01-24 17:49:19 -08:00
parent b325701220
commit a54742d02b
26 changed files with 188 additions and 75 deletions
--- a/gfx/layers/basic/BasicLayersImpl.cpp
+++ b/gfx/layers/basic/BasicLayersImpl.cpp
@@ -71,8 +71,9 @@ GetMaskData(Layer* aMaskLayer, AutoMaskData* aMaskData)
        ->GetAsSurface(getter_AddRefs(surface), &descriptor) &&
        (surface || IsSurfaceDescriptorValid(descriptor))) {
      gfxMatrix transform;
-      DebugOnly<bool> maskIs2D =
-        aMaskLayer->GetEffectiveTransform().CanDraw2D(&transform);
+      gfx3DMatrix effectiveTransform;
+      gfx::To3DMatrix(aMaskLayer->GetEffectiveTransform(), effectiveTransform);
+      DebugOnly<bool> maskIs2D = effectiveTransform.CanDraw2D(&transform);
      NS_ASSERTION(maskIs2D, "How did we end up with a 3D transform here?!");
      if (surface) {
        aMaskData->Construct(transform, surface);