| Index: Source/core/rendering/svg/SVGRenderingContext.cpp
|
| diff --git a/Source/core/rendering/svg/SVGRenderingContext.cpp b/Source/core/rendering/svg/SVGRenderingContext.cpp
|
| index b2ae3617412e5a879d03c10067d6ab014618aab8..d023d4705a074372a0073a6d24c5511794ef5d68 100644
|
| --- a/Source/core/rendering/svg/SVGRenderingContext.cpp
|
| +++ b/Source/core/rendering/svg/SVGRenderingContext.cpp
|
| @@ -65,7 +65,7 @@ SVGRenderingContext::~SVGRenderingContext()
|
|
|
| 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;
|
| }
|
| @@ -77,7 +77,7 @@ SVGRenderingContext::~SVGRenderingContext()
|
|
|
| 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);
|
| }
|
| }
|
|
|
| @@ -150,7 +150,7 @@ void SVGRenderingContext::prepareToRenderSVGContent(RenderObject* object, PaintI
|
|
|
| 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;
|
| @@ -173,7 +173,7 @@ void SVGRenderingContext::prepareToRenderSVGContent(RenderObject* object, PaintI
|
| // 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
|
|
|