Changeset 226317 in webkit

Timestamp:

Jan 1, 2018 12:32:33 PM (6 years ago)

Author:

Simon Fraser

Message:

REGRESSION (r225122): fePointLights don't work
​https://bugs.webkit.org/show_bug.cgi?id=181142

Reviewed by Dan Bates.

Source/WebCore:

r225122 refactored the initialLightingData code, but failed to set the lighting
color in the return value of PointLightSource::computePixelLightingData, so fePointLights
always used black.

Also fix a spelling error in initialLightingData.

Tests: svg/filters/fePointLight-color.svg

• platform/graphics/filters/DistantLightSource.cpp:

(WebCore::DistantLightSource::initPaintingData):
(WebCore::DistantLightSource::computePixelLightingData const):

• platform/graphics/filters/FELighting.cpp:

(WebCore::FELighting::drawLighting):

• platform/graphics/filters/LightSource.h:
• platform/graphics/filters/PointLightSource.cpp:

(WebCore::PointLightSource::computePixelLightingData const):

• platform/graphics/filters/SpotLightSource.cpp:

(WebCore::SpotLightSource::computePixelLightingData const):

LayoutTests:

Ref test that compares a point light with a flood color.

• svg/filters/fePointLight-color-expected.svg: Added.
• svg/filters/fePointLight-color.svg: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/filters/fePointLight-color-expected.svg (added)
• LayoutTests/svg/filters/fePointLight-color.svg (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/filters/DistantLightSource.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/filters/FELighting.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/filters/LightSource.h (modified) (1 diff)
• Source/WebCore/platform/graphics/filters/PointLightSource.cpp (modified) (2 diffs)
• Source/WebCore/platform/graphics/filters/SpotLightSource.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-12-30  Simon Fraser  <simon.fraser@apple.com>
+
+        REGRESSION (r225122): fePointLights don't work
+        https://bugs.webkit.org/show_bug.cgi?id=181142
+
+        Reviewed by Dan Bates.
+
+        Ref test that compares a point light with a flood color.
+
+        * svg/filters/fePointLight-color-expected.svg: Added.
+        * svg/filters/fePointLight-color.svg: Added.
+
 2017-12-31  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-12-30  Simon Fraser  <simon.fraser@apple.com>
+
+        REGRESSION (r225122): fePointLights don't work
+        https://bugs.webkit.org/show_bug.cgi?id=181142
+
+        Reviewed by Dan Bates.
+
+        r225122 refactored the initialLightingData code, but failed to set the lighting
+        color in the return value of PointLightSource::computePixelLightingData, so fePointLights
+        always used black.
+
+        Also fix a spelling error in initialLightingData.
+
+        Tests: svg/filters/fePointLight-color.svg
+
+        * platform/graphics/filters/DistantLightSource.cpp:
+        (WebCore::DistantLightSource::initPaintingData):
+        (WebCore::DistantLightSource::computePixelLightingData const):
+        * platform/graphics/filters/FELighting.cpp:
+        (WebCore::FELighting::drawLighting):
+        * platform/graphics/filters/LightSource.h:
+        * platform/graphics/filters/PointLightSource.cpp:
+        (WebCore::PointLightSource::computePixelLightingData const):
+        * platform/graphics/filters/SpotLightSource.cpp:
+        (WebCore::SpotLightSource::computePixelLightingData const):
+
 2017-12-31  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/platform/graphics/filters/DistantLightSource.cpp

@@ -40 +40 @@
     float azimuth = deg2rad(m_azimuth);
     float elevation = deg2rad(m_elevation);
-    paintingData.intialLightingData.lightVector = {
+    paintingData.initialLightingData.lightVector = {
         std::cos(azimuth) * std::cos(elevation),
         std::sin(azimuth) * std::cos(elevation),
         std::sin(elevation)
     };
-    paintingData.intialLightingData.lightVectorLength = 1;
+    paintingData.initialLightingData.lightVectorLength = 1;
 }
 
 LightSource::ComputedLightingData DistantLightSource::computePixelLightingData(const PaintingData& paintingData, int, int, float) const
 {
-    return paintingData.intialLightingData;
+    return paintingData.initialLightingData;
 }
 

trunk/Source/WebCore/platform/graphics/filters/FELighting.cpp

@@ -401 +401 @@
     
     Color lightColor = (operatingColorSpace() == ColorSpaceLinearRGB) ? sRGBToLinearColor(m_lightingColor) : m_lightingColor;
-    paintingData.intialLightingData.colorVector = FloatPoint3D(lightColor.red(), lightColor.green(), lightColor.blue());
+    paintingData.initialLightingData.colorVector = FloatPoint3D(lightColor.red(), lightColor.green(), lightColor.blue());
     m_lightSource->initPaintingData(paintingData);
 

trunk/Source/WebCore/platform/graphics/filters/LightSource.h

@@ -48 +48 @@
 
     struct PaintingData {
-        ComputedLightingData intialLightingData;
+        ComputedLightingData initialLightingData;
         FloatPoint3D directionVector;
         float coneCutOffLimit;

trunk/Source/WebCore/platform/graphics/filters/PointLightSource.cpp

@@ -40 +40 @@
 }
 
-LightSource::ComputedLightingData PointLightSource::computePixelLightingData(const PaintingData&, int x, int y, float z) const
+LightSource::ComputedLightingData PointLightSource::computePixelLightingData(const PaintingData& paintingData, int x, int y, float z) const
 {
     FloatPoint3D lightVector = {
@@ -48 +48 @@
     };
 
-    return { lightVector, { }, lightVector.length() };
+    return { lightVector, paintingData.initialLightingData.colorVector, lightVector.length() };
 }
 

trunk/Source/WebCore/platform/graphics/filters/SpotLightSource.cpp

@@ -105 +105 @@
     return {
         lightVector,
-        paintingData.intialLightingData.colorVector * lightStrength,
+        paintingData.initialLightingData.colorVector * lightStrength,
         lightVectorLength
     };