Bug 602431, part 6: Honor shadow-layer attributes in the basic layers backend and take off the container-transform training wheels. r=roc

gfx/layers/basic/BasicLayers.cpp

@@ -1121,8 +1121,8 @@ BasicLayerManager::SetRoot(Layer* aLayer)
 static PRBool
 NeedsState(Layer* aLayer)
 {
-  return aLayer->GetClipRect() != nsnull ||
-         !aLayer->GetTransform().IsIdentity();
+  return aLayer->GetEffectiveClipRect() != nsnull ||
+         !aLayer->GetEffectiveTransform().IsIdentity();
 }
 
 static inline int
@@ -1149,25 +1149,24 @@ BasicLayerManager::PaintLayer(Layer* aLayer,
  if (needsSaveRestore) {
     mTarget->Save();
 
-    if (aLayer->GetClipRect()) {
-      const nsIntRect& r = *aLayer->GetClipRect();
+    if (const nsIntRect* r = aLayer->GetEffectiveClipRect()) {
       mTarget->NewPath();
-      mTarget->Rectangle(gfxRect(r.x, r.y, r.width, r.height), PR_TRUE);
+      mTarget->Rectangle(gfxRect(r->x, r->y, r->width, r->height), PR_TRUE);
       mTarget->Clip();
     }
 
     gfxMatrix transform;
     // XXX we need to add some kind of 3D transform support, possibly
     // using pixman?
-    NS_ASSERTION(aLayer->GetTransform().Is2D(),
+    NS_ASSERTION(aLayer->GetEffectiveTransform().Is2D(),
                  "Only 2D transforms supported currently");
-    aLayer->GetTransform().Is2D(&transform);
+    aLayer->GetEffectiveTransform().Is2D(&transform);
     mTarget->Multiply(transform);
 
     if (needsGroup && children > 1) {
       // If we need to call PushGroup, we should clip to the smallest possible
       // area first to minimize the size of the temporary surface.
-      ClipToContain(mTarget, aLayer->GetVisibleRegion().GetBounds());
+      ClipToContain(mTarget, aLayer->GetEffectiveVisibleRegion().GetBounds());
 
       gfxASurface::gfxContentType type = aLayer->CanUseOpaqueSurface()
           ? gfxASurface::CONTENT_COLOR : gfxASurface::CONTENT_COLOR_ALPHA;

layout/ipc/RenderFrameParent.cpp

@@ -268,12 +268,6 @@ RenderFrameParent::BuildLayer(nsDisplayListBuilder* aBuilder,
                                &shadowXScale, &shadowYScale);
     TransformShadowTreeTo(shadowRoot, aVisibleRect,
                           shadowTranslation, shadowXScale, shadowYScale);
-    // FIXME/bug 602431: this is dead code that will be obsoleted in
-    // favor of the above transformations
-    gfxMatrix transform;
-    transform.Translate(gfxPoint(shadowTranslation.x, shadowTranslation.y));
-    transform.Scale(shadowXScale, shadowYScale);
-    mContainer->SetTransform(gfx3DMatrix::From2D(transform));
     mContainer->SetClipRect(nsnull);
   }