Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(927)

Unified Diff: sky/engine/core/rendering/RenderLayer.cpp

Issue 772333002: Remove PaintLayerAppliedTransform. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: merge to ToT Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/rendering/LayerPaintingInfo.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RenderLayer.cpp
diff --git a/sky/engine/core/rendering/RenderLayer.cpp b/sky/engine/core/rendering/RenderLayer.cpp
index 24291a45b4ae4e2b7c0ba142b4353db580c86372..45bc9cc3a6cfe5453c1d7b2201c469ca5d7a8696 100644
--- a/sky/engine/core/rendering/RenderLayer.cpp
+++ b/sky/engine/core/rendering/RenderLayer.cpp
@@ -967,8 +967,7 @@ void RenderLayer::paintLayer(GraphicsContext* context, const LayerPaintingInfo&
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 @@ void RenderLayer::paintLayerContentsAndReflection(GraphicsContext* context, cons
{
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();
« no previous file with comments | « sky/engine/core/rendering/LayerPaintingInfo.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698