Chromium Code Reviews| Index: Source/core/paint/DeprecatedPaintLayerPainter.cpp |
| diff --git a/Source/core/paint/DeprecatedPaintLayerPainter.cpp b/Source/core/paint/DeprecatedPaintLayerPainter.cpp |
| index 0ab32897c8ccba9a5eb9adc2ca63c1e1b6ff839b..1e2539b2a7b65ff340aea2fdcd799b5016ac9d51 100644 |
| --- a/Source/core/paint/DeprecatedPaintLayerPainter.cpp |
| +++ b/Source/core/paint/DeprecatedPaintLayerPainter.cpp |
| @@ -211,20 +211,16 @@ void DeprecatedPaintLayerPainter::paintLayerContents(GraphicsContext* context, c |
| // so they are nested properly. |
| ClipPathHelper clipPathHelper(context, m_paintLayer, paintingInfo, rootRelativeBounds, rootRelativeBoundsComputed, offsetFromRoot, paintFlags); |
| - Optional<LayerClipRecorder> clipRecorder; |
| Optional<CompositingRecorder> compositingRecorder; |
| // Blending operations must be performed only with the nearest ancestor stacking context. |
| // Note that there is no need to composite if we're painting the root. |
| // FIXME: this should be unified further into DeprecatedPaintLayer::paintsWithTransparency(). |
| bool shouldCompositeForBlendMode = (!m_paintLayer.layoutObject()->isDocumentElement() || m_paintLayer.layoutObject()->isSVGRoot()) && m_paintLayer.stackingNode()->isStackingContext() && m_paintLayer.hasNonIsolatedDescendantWithBlendMode(); |
| if (shouldCompositeForBlendMode || m_paintLayer.paintsWithTransparency(paintingInfo.globalPaintFlags())) { |
| - clipRecorder.emplace(*context, *m_paintLayer.layoutObject(), DisplayItem::TransparencyClip, |
| - m_paintLayer.paintingExtent(paintingInfo.rootLayer, paintingInfo.paintDirtyRect, paintingInfo.globalPaintFlags()), |
| - &paintingInfo, LayoutPoint(), paintFlags); |
| - |
| + FloatRect compositingBound = FloatRect(m_paintLayer.paintingExtent(paintingInfo.rootLayer, paintingInfo.paintDirtyRect, paintingInfo.globalPaintFlags())); |
|
pdr.
2015/08/26 03:05:14
Nit: compositingBounds
|
| compositingRecorder.emplace(*context, *m_paintLayer.layoutObject(), |
| WebCoreCompositeToSkiaComposite(CompositeSourceOver, m_paintLayer.layoutObject()->style()->blendMode()), |
| - m_paintLayer.layoutObject()->opacity()); |
| + m_paintLayer.layoutObject()->opacity(), &compositingBound); |
| } |
| DeprecatedPaintLayerPaintingInfo localPaintingInfo(paintingInfo); |