Scaling and offset fix for FELighting (software and skia paths)

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 169 matching lines @@
     offset -= widthMultipliedByPixelSize;
     int topLeft = static_cast<int>(pixels->item(offset - cPixelSize + cAlphaChannelOffset));
     int top = static_cast<int>(pixels->item(offset + cAlphaChannelOffset));
     normalVector.setX(-topLeft + top - (left << 1) + (center << 1));
     normalVector.setY(-topLeft - (top << 1) + left + (center << 1));
 }
 
 inline void FELighting::inlineSetPixel(int offset, LightingData& data, LightSource::PaintingData& paintingData,
                                        int lightX, int lightY, float factorX, float factorY, IntPoint& normal2DVector)
 {
-    m_lightSource->updatePaintingData(paintingData, lightX, lightY, static_cast<float>(data.pixels->item(offset + cAlphaChannelOffset)) * data.surfaceScale);
+    float transformedLightX = (static_cast<float>(lightX) + data.originOffset.width()) / data.worldScale.x();
+    float transformedLightY = (static_cast<float>(lightY) + data.originOffset.height()) / data.worldScale.y();
+    m_lightSource->updatePaintingData(paintingData, transformedLightX, transformedLightY, static_cast<float>(data.pixels->item(offset + cAlphaChannelOffset)) * data.surfaceScale * data.worldScale.z());
 
     float lightStrength;
     if (!normal2DVector.x() && !normal2DVector.y()) {
         // Normal vector is (0, 0, 1). This is a quite frequent case.
         if (m_lightingType == FELighting::DiffuseLighting) {
             lightStrength = m_diffuseConstant * paintingData.lightVector.z() / paintingData.lightVectorLength;
         } else {
             FloatPoint3D halfwayVector = paintingData.lightVector;
             halfwayVector.setZ(halfwayVector.z() + paintingData.lightVectorLength);
             float halfwayVectorLength = halfwayVector.length();
@@ skipping 94 matching lines @@
 inline void FELighting::platformApply(LightingData& data, LightSource::PaintingData& paintingData)
 {
     // The selection here eventually should happen dynamically on some platforms.
 #if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC)
     platformApplyNeon(data, paintingData);
 #else
     platformApplyGeneric(data, paintingData);
 #endif
 }
 
+void FELighting::getTransform(FloatSize* offset, FloatPoint3D* scale) const
+{
+    FloatRect initialEffectRect = effectBoundaries();
+    FloatRect absoluteEffectRect = filter()->mapLocalRectToAbsoluteRect(initialEffectRect);
+    FloatPoint absoluteLocation(absolutePaintRect().location());
+    FloatSize positionOffset(absoluteLocation - absoluteEffectRect.location());
+    offset->setWidth(positionOffset.width());
+    offset->setHeight(positionOffset.height());
+    scale->setX(initialEffectRect.width() > 0.0f && initialEffectRect.width() > 0.0f ? absoluteEffectRect.width() / initialEffectRect.width() : 1.0f);
+    scale->setY(initialEffectRect.height() > 0.0f && initialEffectRect.height() > 0.0f ? absoluteEffectRect.height() / initialEffectRect.height() : 1.0f);
+    // X and Y scale should be the same, but, if not, do a best effort by averaging the 2 for Z scale
+    scale->setZ(0.5f * (scale->x() + scale->y()));
+}
+
 bool FELighting::drawLighting(Uint8ClampedArray* pixels, int width, int height)
 {
     LightSource::PaintingData paintingData;
     LightingData data;
 
     if (!m_lightSource)
         return false;
 
     // FIXME: do something if width or height (or both) is 1 pixel.
     // The W3 spec does not define this case. Now the filter just returns.
     if (width <= 2 || height <= 2)
         return false;
 
     data.pixels = pixels;
     data.surfaceScale = m_surfaceScale / 255.0f;
     data.widthMultipliedByPixelSize = width * cPixelSize;
     data.widthDecreasedByOne = width - 1;
     data.heightDecreasedByOne = height - 1;
+    getTransform(&data.originOffset, &data.worldScale);
     Color lightColor = adaptColorToOperatingColorSpace(m_lightingColor);
     paintingData.colorVector = FloatPoint3D(lightColor.red(), lightColor.green(), lightColor.blue());
     m_lightSource->initPaintingData(paintingData);
 
     // Top/Left corner.
     IntPoint normalVector;
     int offset = 0;
     data.topLeft(offset, normalVector);
     setPixel(offset, data, paintingData, 0, 0, cFactor2div3, cFactor2div3, normalVector);
 
@@ skipping 99 matching lines @@
         SkPoint3 direction(cosf(azimuthRad) * cosf(elevationRad),
                            sinf(azimuthRad) * cosf(elevationRad),
                            sinf(elevationRad));
         if (m_specularConstant > 0)
             return adoptRef(SkLightingImageFilter::CreateDistantLitSpecular(direction, lightColor.rgb(), m_surfaceScale, m_specularConstant, m_specularExponent, input.get(), &rect));
         return adoptRef(SkLightingImageFilter::CreateDistantLitDiffuse(direction, lightColor.rgb(), m_surfaceScale, m_diffuseConstant, input.get(), &rect));
     }
     case LS_POINT: {
         PointLightSource* pointLightSource = static_cast<PointLightSource*>(m_lightSource.get());
         FloatPoint3D position = pointLightSource->position();
-        SkPoint3 skPosition(position.x(), position.y(), position.z());
+        FloatSize offset;
+        FloatPoint3D scale;
+        getTransform(&offset, &scale);
+        SkPoint3 skPosition(position.x() * scale.x() - offset.width(), position.y() * scale.y() - offset.height(), position.z() * scale.z());

[Stephen White, 2014/03/03 17:55:09]

I don't think we should do this. I think we should leave the createImageFilter()
path alone for now, and fix reference filters later by moving all scaling to the
CTM, and fixing Skia lighting filters to simulate Z scale, as you've done in
getTransform() above.

In fact, I think this change may break the SVG-on-SVG path already, since it
applies all scaling and offsets via the CTM.

[sugoi1, 2014/03/03 20:29:30]

Done.

         if (m_specularConstant > 0)
             return adoptRef(SkLightingImageFilter::CreatePointLitSpecular(skPosition, lightColor.rgb(), m_surfaceScale, m_specularConstant, m_specularExponent, input.get(), &rect));
         return adoptRef(SkLightingImageFilter::CreatePointLitDiffuse(skPosition, lightColor.rgb(), m_surfaceScale, m_diffuseConstant, input.get(), &rect));
     }
     case LS_SPOT: {
         SpotLightSource* spotLightSource = static_cast<SpotLightSource*>(m_lightSource.get());
-        SkPoint3 location(spotLightSource->position().x(), spotLightSource->position().y(), spotLightSource->position().z());
-        SkPoint3 target(spotLightSource->direction().x(), spotLightSource->direction().y(), spotLightSource->direction().z());
+        FloatSize offset;
+        FloatPoint3D scale;
+        getTransform(&offset, &scale);
+        SkPoint3 location(spotLightSource->position().x() * scale.x() - offset.width(), spotLightSource->position().y() * scale.y() - offset.height(), spotLightSource->position().z() * scale.z());
+        SkPoint3 target(spotLightSource->direction().x() * scale.x() - offset.width(), spotLightSource->direction().y() * scale.y() - offset.height(), spotLightSource->direction().z() * scale.z());

[Stephen White, 2014/03/03 17:55:09]

Same here.

[sugoi1, 2014/03/03 20:29:30]

Done.

         float specularExponent = spotLightSource->specularExponent();
         float limitingConeAngle = spotLightSource->limitingConeAngle();
         if (!limitingConeAngle || limitingConeAngle > 90 || limitingConeAngle < -90)
             limitingConeAngle = 90;
         if (m_specularConstant > 0)
             return adoptRef(SkLightingImageFilter::CreateSpotLitSpecular(location, target, specularExponent, limitingConeAngle, lightColor.rgb(), m_surfaceScale, m_specularConstant, m_specularExponent, input.get(), &rect));
         return adoptRef(SkLightingImageFilter::CreateSpotLitDiffuse(location, target, specularExponent, limitingConeAngle, lightColor.rgb(), m_surfaceScale, m_diffuseConstant, input.get(), &rect));
     }
     default:
         ASSERT_NOT_REACHED();
@@ skipping 25 matching lines @@
     GraphicsContext* dstContext = resultImage->context();
 
     SkPaint paint;
     RefPtr<SkImageFilter> filter = createImageFilter(0);
     paint.setImageFilter(filter.get());
     dstContext->drawBitmap(nativeImage->bitmap(), drawingRegion.location().x(), drawingRegion.location().y(), &paint);
     return true;
 }
 
 } // namespace WebCore