Harmonize FilterEffect::mapRect and mapPaintRect

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

 /*
  * Copyright (C) 2010 University of Szeged
  * Copyright (C) 2010 Zoltan Herczeg
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 32 matching lines @@
     , m_lightingType(lightingType)
     , m_lightSource(lightSource)
     , m_lightingColor(lightingColor)
     , m_surfaceScale(surfaceScale)
     , m_diffuseConstant(std::max(diffuseConstant, 0.0f))
     , m_specularConstant(std::max(specularConstant, 0.0f))
     , m_specularExponent(clampTo(specularExponent, 1.0f, 128.0f))
 {
 }
 
-FloatRect FELighting::mapPaintRect(const FloatRect& rect, bool) const
-{
-    FloatRect result = rect;
-    // The areas affected need to be a pixel bigger to accommodate the Sobel kernel.
-    result.inflate(1);

[Stephen White, 2016/09/20 15:36:19]

pdr@ attempted to remove this before. I don't think we can remove it, since it
seems like invalidating the interior of a rect should invalidate the pixels
bordering that rect, due to the Sobel kernel. Either I'm wrong, or our testing
is insufficient here (probably needs something where the inner border of the
invalidation region contains some interesting pixels (ie., not solid colour)).

[fs, 2016/09/20 19:14:15]

And he didn't leave a trail of regression tests after (trying) that? =)

Not particularly easy to dream up a reasonable test for this, but added
something. I don't carry high hopes that one will ever catch anything though
(given how the lighting filters will essentially be returning the full region.)
It's there for discussion and tweaks (and "somethingness") though.

-    return result;
-}
-
 sk_sp<SkImageFilter> FELighting::createImageFilter()
 {
     if (!m_lightSource)
         return createTransparentBlack();
 
     SkImageFilter::CropRect rect = getCropRect();
     Color lightColor = adaptColorToOperatingColorSpace(m_lightingColor);
     sk_sp<SkImageFilter> input(SkiaImageFilterBuilder::build(inputEffect(0), operatingColorSpace()));
     switch (m_lightSource->type()) {
     case LS_DISTANT: {
@@ skipping 25 matching lines @@
             return SkLightingImageFilter::MakeSpotLitSpecular(location, target, specularExponent, limitingConeAngle, lightColor.rgb(), m_surfaceScale, m_specularConstant, m_specularExponent, std::move(input), &rect);
         return SkLightingImageFilter::MakeSpotLitDiffuse(location, target, specularExponent, limitingConeAngle, lightColor.rgb(), m_surfaceScale, m_diffuseConstant, std::move(input), &rect);
     }
     default:
         ASSERT_NOT_REACHED();
         return nullptr;
     }
 }
 
 } // namespace blink