Index: third_party/WebKit/Source/core/paint/SVGMaskPainter.cpp |
diff --git a/third_party/WebKit/Source/core/paint/SVGMaskPainter.cpp b/third_party/WebKit/Source/core/paint/SVGMaskPainter.cpp |
index 53d8f0f0530a4eeb634944452ad9aeb4b0924aca..69184187cb52c5be60a51ccc5be7c7fead9ef895 100644 |
--- a/third_party/WebKit/Source/core/paint/SVGMaskPainter.cpp |
+++ b/third_party/WebKit/Source/core/paint/SVGMaskPainter.cpp |
@@ -16,9 +16,8 @@ |
namespace blink { |
-bool SVGMaskPainter::prepareEffect(const LayoutObject& object, GraphicsContext* context) |
+bool SVGMaskPainter::prepareEffect(const LayoutObject& object, GraphicsContext& context) |
{ |
- ASSERT(context); |
ASSERT(m_mask.style()); |
ASSERT_WITH_SECURITY_IMPLICATION(!m_mask.needsLayout()); |
@@ -28,13 +27,12 @@ bool SVGMaskPainter::prepareEffect(const LayoutObject& object, GraphicsContext* |
if (paintInvalidationRect.isEmpty() || !m_mask.element()->hasChildren()) |
return false; |
- context->paintController().createAndAppend<BeginCompositingDisplayItem>(object, SkXfermode::kSrcOver_Mode, 1, &paintInvalidationRect); |
+ context.paintController().createAndAppend<BeginCompositingDisplayItem>(object, SkXfermode::kSrcOver_Mode, 1, &paintInvalidationRect); |
return true; |
} |
-void SVGMaskPainter::finishEffect(const LayoutObject& object, GraphicsContext* context) |
+void SVGMaskPainter::finishEffect(const LayoutObject& object, GraphicsContext& context) |
{ |
- ASSERT(context); |
ASSERT(m_mask.style()); |
ASSERT_WITH_SECURITY_IMPLICATION(!m_mask.needsLayout()); |
@@ -42,28 +40,26 @@ void SVGMaskPainter::finishEffect(const LayoutObject& object, GraphicsContext* c |
{ |
ColorFilter maskLayerFilter = m_mask.style()->svgStyle().maskType() == MT_LUMINANCE |
? ColorFilterLuminanceToAlpha : ColorFilterNone; |
- CompositingRecorder maskCompositing(*context, object, SkXfermode::kDstIn_Mode, 1, &paintInvalidationRect, maskLayerFilter); |
+ CompositingRecorder maskCompositing(context, object, SkXfermode::kDstIn_Mode, 1, &paintInvalidationRect, maskLayerFilter); |
drawMaskForLayoutObject(context, object, object.objectBoundingBox(), paintInvalidationRect); |
} |
- context->paintController().endItem<EndCompositingDisplayItem>(object); |
+ context.paintController().endItem<EndCompositingDisplayItem>(object); |
} |
-void SVGMaskPainter::drawMaskForLayoutObject(GraphicsContext* context, const LayoutObject& layoutObject, const FloatRect& targetBoundingBox, const FloatRect& targetPaintInvalidationRect) |
+void SVGMaskPainter::drawMaskForLayoutObject(GraphicsContext& context, const LayoutObject& layoutObject, const FloatRect& targetBoundingBox, const FloatRect& targetPaintInvalidationRect) |
{ |
- ASSERT(context); |
- |
AffineTransform contentTransformation; |
RefPtr<const SkPicture> maskContentPicture = m_mask.createContentPicture(contentTransformation, targetBoundingBox, context); |
- if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(*context, layoutObject, DisplayItem::SVGMask, LayoutPoint())) |
+ if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(context, layoutObject, DisplayItem::SVGMask, LayoutPoint())) |
return; |
- LayoutObjectDrawingRecorder drawingRecorder(*context, layoutObject, DisplayItem::SVGMask, targetPaintInvalidationRect, LayoutPoint()); |
- context->save(); |
- context->concatCTM(contentTransformation); |
- context->drawPicture(maskContentPicture.get()); |
- context->restore(); |
+ LayoutObjectDrawingRecorder drawingRecorder(context, layoutObject, DisplayItem::SVGMask, targetPaintInvalidationRect, LayoutPoint()); |
+ context.save(); |
+ context.concatCTM(contentTransformation); |
+ context.drawPicture(maskContentPicture.get()); |
+ context.restore(); |
} |
} |