Title: [221810] releases/WebKitGTK/webkit-2.18/Source/WebCore
- Revision
- 221810
- Author
- [email protected]
- Date
- 2017-09-09 00:44:45 -0700 (Sat, 09 Sep 2017)
Log Message
Merge r221742 - [ARM] Building FELightningNEON.cpp fails due to missing {Point,Spot}LightSource declarations
https://bugs.webkit.org/show_bug.cgi?id=176531
Reviewed by Žan Doberšek.
The m_lightSource member is a Ref<LightSource>, and its get() method returns
a reference, therefore the casts have to be done to the corresponding reference
types.
* platform/graphics/cpu/arm/filters/FELightingNEON.h:
(WebCore::FELighting::platformApplyNeon): Adjust casts and member accesses accordingly.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog (221809 => 221810)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-09-09 07:42:57 UTC (rev 221809)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-09-09 07:44:45 UTC (rev 221810)
@@ -1,3 +1,17 @@
+2017-09-07 Adrian Perez de Castro <[email protected]>
+
+ [ARM] Building FELightningNEON.cpp fails due to missing {Point,Spot}LightSource declarations
+ https://bugs.webkit.org/show_bug.cgi?id=176531
+
+ Reviewed by Žan Doberšek.
+
+ The m_lightSource member is a Ref<LightSource>, and its get() method returns
+ a reference, therefore the casts have to be done to the corresponding reference
+ types.
+
+ * platform/graphics/cpu/arm/filters/FELightingNEON.h:
+ (WebCore::FELighting::platformApplyNeon): Adjust casts and member accesses accordingly.
+
2017-09-03 Yusuke Suzuki <[email protected]>
String#utf8() allocates new CString
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h (221809 => 221810)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h 2017-09-09 07:42:57 UTC (rev 221809)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h 2017-09-09 07:44:45 UTC (rev 221810)
@@ -30,6 +30,8 @@
#if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_OR_CLANG)
#include "FELighting.h"
+#include "PointLightSource.h"
+#include "SpotLightSource.h"
#include <wtf/ParallelJobs.h>
namespace WebCore {
@@ -116,17 +118,17 @@
if (m_lightSource->type() == LS_POINT) {
neonData.flags |= FLAG_POINT_LIGHT;
- PointLightSource* pointLightSource = static_cast<PointLightSource*>(m_lightSource.get());
- floatArguments.lightX = pointLightSource->position().x();
- floatArguments.lightY = pointLightSource->position().y();
- floatArguments.lightZ = pointLightSource->position().z();
+ PointLightSource& pointLightSource = static_cast<PointLightSource&>(m_lightSource.get());
+ floatArguments.lightX = pointLightSource.position().x();
+ floatArguments.lightY = pointLightSource.position().y();
+ floatArguments.lightZ = pointLightSource.position().z();
floatArguments.padding2 = 0;
} else if (m_lightSource->type() == LS_SPOT) {
neonData.flags |= FLAG_SPOT_LIGHT;
- SpotLightSource* spotLightSource = static_cast<SpotLightSource*>(m_lightSource.get());
- floatArguments.lightX = spotLightSource->position().x();
- floatArguments.lightY = spotLightSource->position().y();
- floatArguments.lightZ = spotLightSource->position().z();
+ SpotLightSource& spotLightSource = static_cast<SpotLightSource&>(m_lightSource.get());
+ floatArguments.lightX = spotLightSource.position().x();
+ floatArguments.lightY = spotLightSource.position().y();
+ floatArguments.lightZ = spotLightSource.position().z();
floatArguments.padding2 = 0;
floatArguments.directionX = paintingData.directionVector.x();
@@ -137,8 +139,8 @@
floatArguments.coneCutOffLimit = paintingData.coneCutOffLimit;
floatArguments.coneFullLight = paintingData.coneFullLight;
floatArguments.coneCutOffRange = paintingData.coneCutOffLimit - paintingData.coneFullLight;
- neonData.coneExponent = getPowerCoefficients(spotLightSource->specularExponent());
- if (spotLightSource->specularExponent() == 1)
+ neonData.coneExponent = getPowerCoefficients(spotLightSource.specularExponent());
+ if (spotLightSource.specularExponent() == 1)
neonData.flags |= FLAG_CONE_EXPONENT_IS_1;
} else {
ASSERT(m_lightSource->type() == LS_DISTANT);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
