[S.P.] Move svg mask painting to SVGMaskPainter

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 16 matching lines @@
 
 #include "core/frame/FrameHost.h"
 #include "core/layout/Layer.h"
 #include "core/layout/PaintInfo.h"
 #include "core/layout/svg/LayoutSVGResourceFilter.h"
 #include "core/layout/svg/LayoutSVGResourceMasker.h"
 #include "core/layout/svg/SVGLayoutSupport.h"
 #include "core/layout/svg/SVGResources.h"
 #include "core/layout/svg/SVGResourcesCache.h"
 #include "core/paint/RenderDrawingRecorder.h"
+#include "core/paint/SVGMaskPainter.h"
 #include "platform/FloatConversion.h"
 
 namespace blink {
 
 SVGPaintContext::~SVGPaintContext()
 {
     if (m_filter) {
         ASSERT(SVGResourcesCache::cachedResourcesForLayoutObject(m_object));
         ASSERT(SVGResourcesCache::cachedResourcesForLayoutObject(m_object)->filter() == m_filter);
 
         RenderDrawingRecorder recorder(m_originalPaintInfo->context, *m_object, DisplayItem::SVGFilter, LayoutRect::infiniteIntRect());
         m_filter->finishEffect(m_object, m_originalPaintInfo->context);
 
         // Reset the paint info after the filter effect has been completed.
         // This isn't strictly required (e.g., m_paintInfo.rect is not used
         // after this).
         m_paintInfo.context = m_originalPaintInfo->context;
         m_paintInfo.rect = m_originalPaintInfo->rect;
     }
 
     if (m_masker) {
         ASSERT(SVGResourcesCache::cachedResourcesForLayoutObject(m_object));
         ASSERT(SVGResourcesCache::cachedResourcesForLayoutObject(m_object)->masker() == m_masker);
-        m_masker->finishEffect(m_object, m_paintInfo.context);
+        SVGMaskPainter(*m_masker).finishEffect(m_object, m_paintInfo.context);
     }
 
     if (m_clipper) {
         ASSERT(SVGResourcesCache::cachedResourcesForLayoutObject(m_object));
         ASSERT(SVGResourcesCache::cachedResourcesForLayoutObject(m_object)->clipper() == m_clipper);
         m_clipper->postApplyStatefulResource(m_object, m_paintInfo.context, m_clipperState);
     }
 }
 
 bool SVGPaintContext::applyClipMaskAndFilterIfNecessary()
@@ skipping 66 matching lines @@
                 return false;
             m_clipPathRecorder = adoptPtr(new ClipPathRecorder(*m_paintInfo.context, m_object->displayItemClient(), clipPath->path(m_object->objectBoundingBox()), clipPath->windRule()));
         }
     }
     return true;
 }
 
 bool SVGPaintContext::applyMaskIfNecessary(SVGResources* resources)
 {
     if (LayoutSVGResourceMasker* masker = resources ? resources->masker() : nullptr) {
-        if (!masker->prepareEffect(m_object, m_paintInfo.context))
+        if (!SVGMaskPainter(*masker).prepareEffect(m_object, m_paintInfo.context))
             return false;
         m_masker = masker;
     }
     return true;
 }
 
 bool SVGPaintContext::applyFilterIfNecessary(SVGResources* resources)
 {
     if (!resources) {
         if (m_object->style()->svgStyle().hasFilter())
@@ skipping 31 matching lines @@
 {
     ASSERT(context);
     ASSERT(item);
     ASSERT(!item->needsLayout());
 
     PaintInfo info(context, LayoutRect::infiniteIntRect(), PaintPhaseForeground, PaintBehaviorNormal);
     item->paint(info, IntPoint());
 }
 
 } // namespace blink