Remove PaintLayerAppliedTransform. This was for RenderReplica, which we no longer have. R=esprehn@chromium.org Review URL: https://codereview.chromium.org/772333002
diff --git a/sky/engine/core/rendering/LayerPaintingInfo.h b/sky/engine/core/rendering/LayerPaintingInfo.h index 0c0e374..0b10f11 100644 --- a/sky/engine/core/rendering/LayerPaintingInfo.h +++ b/sky/engine/core/rendering/LayerPaintingInfo.h
@@ -54,7 +54,6 @@ enum PaintLayerFlag { PaintLayerHaveTransparency = 1, - PaintLayerAppliedTransform = 1 << 1, // FIXME(sky): This is unused. Remove it. PaintLayerUncachedClipRects = 1 << 2, PaintLayerPaintingOverlayScrollbars = 1 << 4,
diff --git a/sky/engine/core/rendering/RenderLayer.cpp b/sky/engine/core/rendering/RenderLayer.cpp index 24291a4..45bc9cc 100644 --- a/sky/engine/core/rendering/RenderLayer.cpp +++ b/sky/engine/core/rendering/RenderLayer.cpp
@@ -967,8 +967,7 @@ if (paintsWithTransparency(paintingInfo.paintBehavior)) paintFlags |= PaintLayerHaveTransparency; - // PaintLayerAppliedTransform is used in RenderReplica, to avoid applying the transform twice. - if (paintsWithTransform(paintingInfo.paintBehavior) && !(paintFlags & PaintLayerAppliedTransform)) { + if (paintsWithTransform(paintingInfo.paintBehavior)) { TransformationMatrix layerTransform = renderableTransform(paintingInfo.paintBehavior); // If the transform can't be inverted, then don't paint anything. if (!layerTransform.isInvertible()) @@ -1012,16 +1011,13 @@ { ASSERT(isSelfPaintingLayer() || hasSelfPaintingLayerDescendant()); - PaintLayerFlags localPaintFlags = paintFlags & ~(PaintLayerAppliedTransform); - - localPaintFlags |= PaintLayerPaintingCompositingAllPhases; + PaintLayerFlags localPaintFlags = paintFlags | PaintLayerPaintingCompositingAllPhases; paintLayerContents(context, paintingInfo, localPaintFlags); } void RenderLayer::paintLayerContents(GraphicsContext* context, const LayerPaintingInfo& paintingInfo, PaintLayerFlags paintFlags) { ASSERT(isSelfPaintingLayer() || hasSelfPaintingLayerDescendant()); - ASSERT(!(paintFlags & PaintLayerAppliedTransform)); bool haveTransparency = paintFlags & PaintLayerHaveTransparency; bool isSelfPaintingLayer = this->isSelfPaintingLayer();