Cleanup transform-related methods in RenderLayer.

sky/engine/core/rendering/RenderBox.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 678 matching lines @@
 
 void RenderBox::paintLayer(GraphicsContext* context, RenderLayer* rootLayer, const IntRect& rect)
 {
     // If this layer is totally invisible then there is nothing to paint.
     // TODO(ojan): Return false from isSelfPainting and then ASSERT(!opacity()) here.
     if (!opacity())
         return;
 
     LayerPaintingInfo paintingInfo(rootLayer, rect, LayoutSize());
 
-    if (!layer()->paintsWithTransform()) {
+    TransformationMatrix* layerTransform = layer()->transform();
+
+    if (!layerTransform) {
         paintLayerContents(context, paintingInfo, rect);
         return;
     }
 
     // The RenderView can't be transformed in Sky.
     ASSERT(layer()->parent());
 
-    TransformationMatrix layerTransform = layer()->renderableTransform();
     // If the transform can't be inverted, then don't paint anything.
-    if (!layerTransform.isInvertible())
+    if (!layerTransform->isInvertible())
         return;
 
     // If we have a transparency layer enclosing us and we are the root of a transform, then we need to establish the transparency
     // layer from the parent now, assuming there is a parent
     if (layer()->isTransparent()) {
-        // TODO(ojan): This should ASSERT(layer()->parent()) instead of branching since the
-        // RenderView can't be transformed in sky.
-        if (layer()->parent())
-            layer()->parent()->beginTransparencyLayers(context, paintingInfo.rootLayer, paintingInfo.paintDirtyRect, paintingInfo.subPixelAccumulation);
-        else
-            layer()->beginTransparencyLayers(context, paintingInfo.rootLayer, paintingInfo.paintDirtyRect, paintingInfo.subPixelAccumulation);
+        layer()->parent()->beginTransparencyLayers(context, paintingInfo.rootLayer, paintingInfo.paintDirtyRect, paintingInfo.subPixelAccumulation);
     }
 
     // Make sure the parent's clip rects have been calculated.
     ClipRectsContext clipRectsContext(paintingInfo.rootLayer, PaintingClipRects);
     ClipRect clipRect = layer()->clipper().backgroundClipRect(clipRectsContext);
     clipRect.intersect(paintingInfo.paintDirtyRect);
 
     // Push the parent coordinate space's clip.
     layer()->parent()->clipToRect(paintingInfo, context, clipRect);
 
     // This involves subtracting out the position of the layer in our current coordinate space, but preserving
     // the accumulated error for sub-pixel layout.
     LayoutPoint delta;
     layer()->convertToLayerCoords(paintingInfo.rootLayer, delta);
-    TransformationMatrix transform(layer()->renderableTransform());
+    TransformationMatrix transform(*layerTransform);
     IntPoint roundedDelta = roundedIntPoint(delta);
     transform.translateRight(roundedDelta.x(), roundedDelta.y());
     LayoutSize adjustedSubPixelAccumulation = paintingInfo.subPixelAccumulation + (delta - roundedDelta);
 
     // Apply the transform.
     GraphicsContextStateSaver stateSaver(*context, false);
     if (!transform.isIdentity()) {
         stateSaver.save();
         context->concatCTM(transform.toAffineTransform());
     }
@@ skipping 2231 matching lines @@
 LayoutRect RenderBox::layoutOverflowRectForPropagation() const
 {
     // Only propagate interior layout overflow if we don't clip it.
     LayoutRect rect = borderBoxRect();
     rect.expand(LayoutSize(LayoutUnit(), marginAfter()));
 
     if (!hasOverflowClip())
         rect.unite(layoutOverflowRect());
 
     if (hasLayer() && layer()->transform())
-        rect = layer()->currentTransform().mapRect(rect);
+        rect = layer()->transform()->mapRect(rect);
 
     return rect;
 }
 
 LayoutUnit RenderBox::offsetLeft() const
 {
     return adjustedPositionRelativeToOffsetParent(location()).x();
 }
 
 LayoutUnit RenderBox::offsetTop() const
@@ skipping 10 matching lines @@
 
 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style)
 {
     backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor);
     hasBackground = backgroundColor.alpha() || style.hasBackgroundImage();
     ASSERT(hasBackground == style.hasBackground());
     hasBorder = style.hasBorder();
 }
 
 } // namespace blink