Introduce new entry-points for non-paint-server RenderSVGResources

Source/core/rendering/svg/SVGRenderingContext.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 47 matching lines @@
         return;
 
     ASSERT(m_object && m_paintInfo);
 
     if (m_renderingFlags & PostApplyResources) {
         ASSERT(m_masker || m_clipper || m_filter);
         ASSERT(SVGResourcesCache::cachedResourcesForRenderObject(m_object));
 
         if (m_filter) {
             ASSERT(SVGResourcesCache::cachedResourcesForRenderObject(m_object)->filter() == m_filter);
-            m_filter->postApplyResource(m_object, m_paintInfo->context);
+            m_filter->finishEffect(m_object, m_paintInfo->context);
             m_paintInfo->context = m_savedContext;
             m_paintInfo->rect = m_savedPaintRect;
         }
 
         if (m_clipper) {
             ASSERT(SVGResourcesCache::cachedResourcesForRenderObject(m_object)->clipper() == m_clipper);
             m_clipper->postApplyStatefulResource(m_object, m_paintInfo->context, m_clipperState);
         }
 
         if (m_masker) {
             ASSERT(SVGResourcesCache::cachedResourcesForRenderObject(m_object)->masker() == m_masker);
-            m_masker->postApplyResource(m_object, m_paintInfo->context);
+            m_masker->finishEffect(m_object, m_paintInfo->context);
         }
     }
 
     if (m_renderingFlags & EndOpacityLayer)
         m_paintInfo->context->endLayer();
 
     if (m_renderingFlags & RestoreGraphicsContext)
         m_paintInfo->context->restore();
 }
 
@@ skipping 52 matching lines @@
     if (!resources) {
         if (svgStyle.hasFilter())
             return;
 
         m_renderingFlags |= RenderingPrepared;
         return;
     }
 
     if (!isRenderingMask) {
         if (RenderSVGResourceMasker* masker = resources->masker()) {
-            if (!masker->applyResource(m_object, style, m_paintInfo->context, ApplyToDefaultMode))
+            if (!masker->prepareEffect(m_object, style, m_paintInfo->context))
                 return;
             m_masker = masker;
             m_renderingFlags |= PostApplyResources;
         }
     }
 
     RenderSVGResourceClipper* clipper = resources->clipper();
     if (!clipPathOperation && clipper) {
         if (!clipper->applyStatefulResource(m_object, m_paintInfo->context, m_clipperState))
             return;
         m_clipper = clipper;
         m_renderingFlags |= PostApplyResources;
     }
 
     if (!isRenderingMask) {
         m_filter = resources->filter();
         if (m_filter) {
             m_savedContext = m_paintInfo->context;
             m_savedPaintRect = m_paintInfo->rect;
             // Return with false here may mean that we don't need to draw the content
             // (because it was either drawn before or empty) but we still need to apply the filter.
             m_renderingFlags |= PostApplyResources;
-            if (!m_filter->applyResource(m_object, style, m_paintInfo->context, ApplyToDefaultMode))
+            if (!m_filter->prepareEffect(m_object, style, m_paintInfo->context))
                 return;
 
             // Since we're caching the resulting bitmap and do not invalidate it on paint invalidation rect
             // changes, we need to paint the whole filter region. Otherwise, elements not visible
             // at the time of the initial paint (due to scrolling, window size, etc.) will never
             // be drawn.
             m_paintInfo->rect = IntRect(m_filter->drawingRegion(m_object));
         }
     }
 
@@ skipping 111 matching lines @@
             SVGImagePainter::paintForeground(toRenderSVGImage(*m_object), bufferedInfo);
         } else
             return false;
     }
 
     m_paintInfo->context->drawImageBuffer(imageBuffer.get(), boundingBox);
     return true;
 }
 
 } // namespace blink