Changeset 286925 in webkit for trunk/Source/WebCore/css/CSSGradientValue.cpp

Timestamp:

Dec 12, 2021, 9:31:36 AM (3 years ago)

Author:

[email protected]

Message:

Pipe ColorInterpolationMethod into Gradient
​https://bugs.webkit.org/show_bug.cgi?id=234205

Reviewed by Antti Koivisto.

Source/WebCore:

There is no functional change yet, this just adds a required ColorInterpolationMethod parameter to
Gradient, which for the moment has to be SRGB and non-premultiplied alpha. Subsequent changes will
support for specifying an interpolation method via CSS gradients as well as implementing support
for that in the platform gradient backends.

Also moves the ColorInterpolationMethod struct into its own file as it was getting quite long.

• Headers.cmake:
• WebCore.xcodeproj/project.pbxproj:
• css/CSSGradientValue.cpp:

(WebCore::CSSGradientValue::equals const):
(WebCore::CSSLinearGradientValue::createGradient):
(WebCore::CSSRadialGradientValue::createGradient):
(WebCore::CSSConicGradientValue::createGradient):

• css/CSSGradientValue.h:

(WebCore::CSSGradientValue::CSSGradientValue):
(WebCore::CSSGradientValue::colorInterpolationMethod const):

• css/parser/CSSPropertyParserHelpers.cpp:

(WebCore::CSSPropertyParserHelpers::consumeDeprecatedGradient):
(WebCore::CSSPropertyParserHelpers::consumeDeprecatedRadialGradient):
(WebCore::CSSPropertyParserHelpers::consumeRadialGradient):
(WebCore::CSSPropertyParserHelpers::consumeLinearGradient):
(WebCore::CSSPropertyParserHelpers::consumeConicGradient):

• html/HTMLInputElement.cpp:

(WebCore::autoFillStrongPasswordMaskImage):

• html/canvas/CanvasGradient.cpp:

(WebCore::CanvasGradient::CanvasGradient):

• platform/graphics/ColorInterpolation.h:

(WebCore::interpolateColorComponents):
(WebCore::ColorInterpolationMethod::encode const): Deleted.
(WebCore::ColorInterpolationMethod::decode): Deleted.

• platform/graphics/ColorInterpolationMethod.h: Added.

(WebCore::ColorInterpolationMethod::encode const):
(WebCore::ColorInterpolationMethod::decode):
(WebCore::add):
(WebCore::operator==):

• platform/graphics/Gradient.cpp:

(WebCore::Gradient::create):
(WebCore::Gradient::Gradient):
(WebCore::Gradient::hash const):

• platform/graphics/Gradient.h:

(WebCore::Gradient::encode const):
(WebCore::Gradient::decode):

• rendering/RenderThemeIOS.mm:

(WebCore::RenderThemeIOS::paintProgressBar):
(WebCore::RenderThemeIOS::checkboxRadioBackgroundGradient):
(WebCore::RenderThemeIOS::paintColorWellDecorations):

• rendering/svg/RenderSVGResourceLinearGradient.cpp:

(WebCore::RenderSVGResourceLinearGradient::buildGradient const):

• rendering/svg/RenderSVGResourceRadialGradient.cpp:

(WebCore::RenderSVGResourceRadialGradient::buildGradient const):

Tools:

Update calls to Gradient::create() to pass the now required ColorInterpolationMethod.

• TestWebKitAPI/Tests/WebCore/DisplayListTests.cpp:

(TestWebKitAPI::createGradient):

• TestWebKitAPI/Tests/WebCore/cg/BifurcatedGraphicsContextTestsCG.cpp:

(TestWebKitAPI::TEST):

File:

• trunk/Source/WebCore/css/CSSGradientValue.cpp (modified) (4 diffs)

trunk/Source/WebCore/css/CSSGradientValue.cpp

@@ -658 +658 @@
         && m_stops == other.m_stops
         && m_gradientType == other.m_gradientType
-        && m_repeating == other.m_repeating;
+        && m_repeating == other.m_repeating
+        && m_colorInterpolationMethod == other.m_colorInterpolationMethod;
 }
 
@@ -872 +873 @@
     auto stops = computeStops(adapter, conversionData, renderer.style(), 1);
 
-    auto gradient = Gradient::create(WTFMove(data));
+    auto gradient = Gradient::create(WTFMove(data), colorInterpolationMethod());
     gradient->setSortedColorStops(WTFMove(stops));
     return gradient;
@@ -1206 +1207 @@
     auto stops = computeStops(adapter, conversionData, renderer.style(), maxExtent);
 
-    auto gradient = Gradient::create(WTFMove(data));
+    auto gradient = Gradient::create(WTFMove(data), colorInterpolationMethod());
     gradient->setSortedColorStops(WTFMove(stops));
     return gradient;
@@ -1280 +1281 @@
     auto stops = computeStops(adapter, conversionData, renderer.style(), 1);
 
-    auto gradient = Gradient::create(WTFMove(data));
+    auto gradient = Gradient::create(WTFMove(data), colorInterpolationMethod());
     gradient->setSortedColorStops(WTFMove(stops));
     return gradient;