diff options
Diffstat (limited to 'WebCore/rendering/RenderSVGResourceFilter.cpp')
| -rw-r--r-- | WebCore/rendering/RenderSVGResourceFilter.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/WebCore/rendering/RenderSVGResourceFilter.cpp b/WebCore/rendering/RenderSVGResourceFilter.cpp index 982375e..698033e 100644 --- a/WebCore/rendering/RenderSVGResourceFilter.cpp +++ b/WebCore/rendering/RenderSVGResourceFilter.cpp @@ -1,8 +1,8 @@ /* * Copyright (C) 2004, 2005, 2006, 2007 Nikolas Zimmermann <zimmermann@kde.org> - * 2004, 2005 Rob Buis <buis@kde.org> - * 2005 Eric Seidel <eric@webkit.org> - * 2009 Dirk Schulze <krit@webkit.org> + * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org> + * Copyright (C) 2005 Eric Seidel <eric@webkit.org> + * Copyright (C) 2009 Dirk Schulze <krit@webkit.org> * Copyright (C) Research In Motion Limited 2010. All rights reserved. * * This library is free software; you can redistribute it and/or @@ -19,7 +19,6 @@ * along with this library; see the file COPYING.LIB. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. - * */ #include "config.h" @@ -193,12 +192,12 @@ bool RenderSVGResourceFilter::applyResource(RenderObject* object, RenderStyle*, if (!lastEffect) return false; - lastEffect->calculateEffectRect(filterData->filter.get()); + lastEffect->determineFilterPrimitiveSubregion(filterData->filter.get()); // At least one FilterEffect has a too big image size, // recalculate the effect sizes with new scale factors. if (!fitsInMaximumImageSize(filterData->filter->maxImageSize(), scale)) { filterData->filter->setFilterResolution(scale); - lastEffect->calculateEffectRect(filterData->filter.get()); + lastEffect->determineFilterPrimitiveSubregion(filterData->filter.get()); } clippedSourceRect.scale(scale.width(), scale.height()); @@ -255,7 +254,7 @@ void RenderSVGResourceFilter::postApplyResource(RenderObject* object, GraphicsCo FilterEffect* lastEffect = filterData->builder->lastEffect(); - if (lastEffect && !filterData->boundaries.isEmpty() && !lastEffect->subRegion().isEmpty()) { + if (lastEffect && !filterData->boundaries.isEmpty() && !lastEffect->filterPrimitiveSubregion().isEmpty()) { // This is the real filtering of the object. It just needs to be called on the // initial filtering process. We just take the stored filter result on a // second drawing. @@ -272,7 +271,7 @@ void RenderSVGResourceFilter::postApplyResource(RenderObject* object, GraphicsCo ImageBuffer* resultImage = lastEffect->resultImage(); if (resultImage) - context->drawImageBuffer(resultImage, object->style()->colorSpace(), lastEffect->subRegion()); + context->drawImageBuffer(resultImage, object->style()->colorSpace(), lastEffect->filterPrimitiveSubregion()); } filterData->sourceGraphicBuffer.clear(); |