Implement SVG masking with slimming paint

Source/core/paint/SVGPaintContext.cpp

 /*
  * Copyright (C) 2007, 2008 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Google, Inc.  All rights reserved.
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) Research In Motion Limited 2009-2010. 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 78 matching lines @@
     if (!applyClipIfNecessary(resources))
         return false;
 
     if (!applyMaskIfNecessary(resources))
         return false;
 
     if (!applyFilterIfNecessary(resources))
         return false;
 
     if (!isIsolationInstalled() && SVGLayoutSupport::isIsolationRequired(m_object))
-        m_compositingRecorder = adoptPtr(new CompositingRecorder(m_paintInfo.context, m_object->displayItemClient(), m_paintInfo.context->compositeOperationDeprecated(), WebBlendModeNormal, 1));
+        m_compositingRecorder = adoptPtr(new CompositingRecorder(m_paintInfo.context, m_object->displayItemClient(), WebCoreCompositeToSkiaComposite(m_paintInfo.context->compositeOperationDeprecated(), WebBlendModeNormal), 1));
 
     return true;
 }
 
 void SVGPaintContext::applyCompositingIfNecessary()
 {
     ASSERT(!m_paintInfo.isRenderingClipPathAsMaskImage());
 
     // Layer takes care of root opacity and blend mode.
     if (m_object->isSVGRoot())
         return;
 
     const LayoutStyle& style = m_object->styleRef();
     float opacity = style.opacity();
     bool hasBlendMode = style.hasBlendMode() && m_object->isBlendingAllowed();
     if (opacity < 1 || hasBlendMode) {
         m_clipRecorder = adoptPtr(new FloatClipRecorder(*m_paintInfo.context, m_object->displayItemClient(), m_paintInfo.phase, m_object->paintInvalidationRectInLocalCoordinates()));
         WebBlendMode blendMode = hasBlendMode ? style.blendMode() : WebBlendModeNormal;
         CompositeOperator compositeOp = hasBlendMode ? CompositeSourceOver : m_paintInfo.context->compositeOperationDeprecated();
-        m_compositingRecorder = adoptPtr(new CompositingRecorder(m_paintInfo.context, m_object->displayItemClient(), compositeOp, blendMode, opacity));
+        m_compositingRecorder = adoptPtr(new CompositingRecorder(m_paintInfo.context, m_object->displayItemClient(), WebCoreCompositeToSkiaComposite(compositeOp, blendMode), opacity));
     }
 }
 
 bool SVGPaintContext::applyClipIfNecessary(SVGResources* resources)
 {
     // resources->clipper() corresponds to the non-prefixed 'clip-path' whereas
     // m_object->style()->clipPath() corresponds to '-webkit-clip-path'.
     // FIXME: We should unify the clip-path and -webkit-clip-path codepaths.
     if (LayoutSVGResourceClipper* clipper = resources ? resources->clipper() : nullptr) {
         if (!clipper->applyStatefulResource(m_object, m_paintInfo.context, m_clipperState))
@@ skipping 59 matching lines @@
 {
     ASSERT(context);
     ASSERT(item);
     ASSERT(!item->needsLayout());
 
     PaintInfo info(context, LayoutRect::infiniteIntRect(), PaintPhaseForeground, PaintBehaviorNormal);
     item->paint(info, IntPoint());
 }
 
 } // namespace blink