Diff
Modified: trunk/Source/WebCore/ChangeLog (286186 => 286187)
--- trunk/Source/WebCore/ChangeLog 2021-11-26 23:51:15 UTC (rev 286186)
+++ trunk/Source/WebCore/ChangeLog 2021-11-27 02:43:21 UTC (rev 286187)
@@ -1,3 +1,19 @@
+2021-11-26 Sam Weinig <wei...@apple.com>
+
+ Typo in ColorConversion code: converColorComponents
+ https://bugs.webkit.org/show_bug.cgi?id=233497
+
+ Reviewed by Ryosuke Niwa.
+
+ Fix typo in ColorConversion code. converColorComponents -> convertColorComponents
+
+ * platform/graphics/Color.cpp:
+ (WebCore::Color::toColorComponentsInColorSpace const):
+ * platform/graphics/ColorConversion.cpp:
+ (WebCore::convertColorComponents):
+ (WebCore::converColorComponents): Deleted.
+ * platform/graphics/ColorConversion.h:
+
2021-11-26 Said Abou-Hallawa <s...@apple.com>
[GPU Process] Make FilterEffects create FilterEffectAppliers which will be used by FilterEffect::apply()
Modified: trunk/Source/WebCore/platform/graphics/Color.cpp (286186 => 286187)
--- trunk/Source/WebCore/platform/graphics/Color.cpp 2021-11-26 23:51:15 UTC (rev 286186)
+++ trunk/Source/WebCore/platform/graphics/Color.cpp 2021-11-27 02:43:21 UTC (rev 286187)
@@ -165,13 +165,13 @@
ColorComponents<float, 4> Color::toColorComponentsInColorSpace(ColorSpace outputColorSpace) const
{
auto [inputColorSpace, components] = colorSpaceAndComponents();
- return converColorComponents(inputColorSpace, components, outputColorSpace);
+ return convertColorComponents(inputColorSpace, components, outputColorSpace);
}
ColorComponents<float, 4> Color::toColorComponentsInColorSpace(const DestinationColorSpace& outputColorSpace) const
{
auto [inputColorSpace, components] = colorSpaceAndComponents();
- return converColorComponents(inputColorSpace, components, outputColorSpace);
+ return convertColorComponents(inputColorSpace, components, outputColorSpace);
}
std::pair<ColorSpace, ColorComponents<float, 4>> Color::colorSpaceAndComponents() const
Modified: trunk/Source/WebCore/platform/graphics/ColorConversion.cpp (286186 => 286187)
--- trunk/Source/WebCore/platform/graphics/ColorConversion.cpp 2021-11-26 23:51:15 UTC (rev 286186)
+++ trunk/Source/WebCore/platform/graphics/ColorConversion.cpp 2021-11-27 02:43:21 UTC (rev 286187)
@@ -275,7 +275,7 @@
// MARK: Conversion functions for raw color components with associated color spaces.
-ColorComponents<float, 4> converColorComponents(ColorSpace inputColorSpace, ColorComponents<float, 4> inputColorComponents, ColorSpace outputColorSpace)
+ColorComponents<float, 4> convertColorComponents(ColorSpace inputColorSpace, ColorComponents<float, 4> inputColorComponents, ColorSpace outputColorSpace)
{
return callWithColorType(inputColorComponents, inputColorSpace, [outputColorSpace] (const auto& inputColor) {
switch (outputColorSpace) {
@@ -306,7 +306,7 @@
});
}
-ColorComponents<float, 4> converColorComponents(ColorSpace inputColorSpace, ColorComponents<float, 4> inputColorComponents, const DestinationColorSpace& outputColorSpace)
+ColorComponents<float, 4> convertColorComponents(ColorSpace inputColorSpace, ColorComponents<float, 4> inputColorComponents, const DestinationColorSpace& outputColorSpace)
{
#if USE(CG)
return platformConvertColorComponents(inputColorSpace, inputColorComponents, outputColorSpace);
Modified: trunk/Source/WebCore/platform/graphics/ColorConversion.h (286186 => 286187)
--- trunk/Source/WebCore/platform/graphics/ColorConversion.h 2021-11-26 23:51:15 UTC (rev 286186)
+++ trunk/Source/WebCore/platform/graphics/ColorConversion.h 2021-11-27 02:43:21 UTC (rev 286187)
@@ -37,8 +37,8 @@
template<typename Output, typename Input> Output convertColor(const Input& color);
// Conversion functions for raw color components with associated color spaces.
-ColorComponents<float, 4> converColorComponents(ColorSpace inputColorSpace, ColorComponents<float, 4> inputColorComponents, ColorSpace outputColorSpace);
-ColorComponents<float, 4> converColorComponents(ColorSpace inputColorSpace, ColorComponents<float, 4> inputColorComponents, const DestinationColorSpace& outputColorSpace);
+ColorComponents<float, 4> convertColorComponents(ColorSpace inputColorSpace, ColorComponents<float, 4> inputColorComponents, ColorSpace outputColorSpace);
+ColorComponents<float, 4> convertColorComponents(ColorSpace inputColorSpace, ColorComponents<float, 4> inputColorComponents, const DestinationColorSpace& outputColorSpace);
// All color types, other than XYZA or those inheriting from RGBType, must implement
