Disentangle filter content recording state from FilterData

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 13 matching lines @@
 
 #include "config.h"
 #include "core/paint/SVGPaintContext.h"
 
 #include "core/frame/FrameHost.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/SVGFilterPainter.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);
-        SVGFilterPainter(*m_filter).finishEffect(*m_object, m_originalPaintInfo->context);
+        ASSERT(m_filterRecordingContext);
+        SVGFilterPainter(*m_filter).finishEffect(*m_object, *m_filterRecordingContext);
 
         // 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));
@@ skipping 91 matching lines @@
     }
     return true;
 }
 
 bool SVGPaintContext::applyFilterIfNecessary(SVGResources* resources)
 {
     if (!resources) {
         if (m_object->style()->svgStyle().hasFilter())
             return false;
     } else if (LayoutSVGResourceFilter* filter = resources->filter()) {
+        m_filterRecordingContext = adoptPtr(new SVGFilterRecordingContext(m_paintInfo.context));
         m_filter = filter;
-        GraphicsContext* filterContext = SVGFilterPainter(*filter).prepareEffect(*m_object, m_paintInfo.context);
+        GraphicsContext* filterContext = SVGFilterPainter(*filter).prepareEffect(*m_object, *m_filterRecordingContext);
         if (!filterContext)
             return false;
 
         // Because the filter needs to cache its contents we replace the context
         // during filtering with the filter's context.
         m_paintInfo.context = filterContext;
 
         // Because we cache the filter contents and do not invalidate on paint
         // invalidation rect changes, we need to paint the entire filter region
         // so elements outside the initial paint (due to scrolling, etc) paint.
@@ skipping 54 matching lines @@
     // though.
     // Additionally, it's not really safe/guaranteed to be correct, as
     // something down the paint pipe may want to farther tweak the color
     // filter, which could yield incorrect results. (Consider just using
     // saveLayer() w/ this color filter explicitly instead.)
     paint.setColorFilter(paintInfo.context->colorFilter());
     return true;
 }
 
 } // namespace blink