Move application of filter effect boundaries to a helper

third_party/WebKit/Source/platform/graphics/filters/FETile.cpp

 /*
  * Copyright (C) 2008 Alex Mathews <possessedpenguinbob@gmail.com>
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) 2013 Google Inc. 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
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 27 matching lines @@
 PassRefPtrWillBeRawPtr<FETile> FETile::create(Filter* filter)
 {
     return adoptRefWillBeNoop(new FETile(filter));
 }
 
 FloatRect FETile::mapPaintRect(const FloatRect& rect, bool forward)
 {
     return forward ? maxEffectRect() : inputEffect(0)->maxEffectRect();
 }
 
-static FloatRect getRect(FilterEffect* effect)
-{
-    FloatRect result = effect->filter()->filterRegion();
-    FloatRect boundaries = effect->effectBoundaries();
-    if (effect->hasX())
-        result.setX(boundaries.x());
-    if (effect->hasY())
-        result.setY(boundaries.y());
-    if (effect->hasWidth())
-        result.setWidth(boundaries.width());
-    if (effect->hasHeight())
-        result.setHeight(boundaries.height());
-    return result;
-}
-
 PassRefPtr<SkImageFilter> FETile::createImageFilter(SkiaImageFilterBuilder& builder)
 {
     RefPtr<SkImageFilter> input(builder.build(inputEffect(0), operatingColorSpace()));
-    FloatRect srcRect = inputEffect(0) ? getRect(inputEffect(0)) : filter()->filterRegion();
-    FloatRect dstRect = getRect(this);
+    FloatRect srcRect = filter()->filterRegion();
+    inputEffect(0)->applyEffectBoundaries(srcRect);

[Stephen White, 2015/11/19 14:54:34]

Can inputEffect(0) not be null here?

[fs, 2015/11/19 15:48:09]

Nope. (That should even hold generally - at least for FilterEffects built via
SVGFilterBuilder. In this specific case this was already assumed by all the
other methods.)

+    FloatRect dstRect = filter()->filterRegion();
+    applyEffectBoundaries(dstRect);
     return adoptRef(SkTileImageFilter::Create(srcRect, dstRect, input.get()));
 }
 
 TextStream& FETile::externalRepresentation(TextStream& ts, int indent) const
 {
     writeIndent(ts, indent);
     ts << "[feTile";
     FilterEffect::externalRepresentation(ts);
     ts << "]\n";
     inputEffect(0)->externalRepresentation(ts, indent + 1);
 
     return ts;
 }
 
 } // namespace blink