Changeset 262128 in webkit

Timestamp:

May 25, 2020 11:30:16 AM (4 years ago)

Author:

weinig@apple.com

Message:

Extended Color Cleanup: Use the name SimpleColor consistently
​https://bugs.webkit.org/show_bug.cgi?id=212337

Reviewed by Anders Carlsson.
Source/WebCore:

• Removes RGBA32 type alias, updating all remaining users of it.
• Renames functions that take/return SimpleColor to use the name SimpleColor rather than RGB (e.g. makeRGBA -> makeSimpleColor)
• Moves hex color parsing from Color to SimpleColor, as that is the type it returns. Also took the opportunity to make it return an Optional<SimpleColor> instead of using a bool/out parameter.
• Move Color::compositionFill to editing/CompositionHighlight.h It makes no real sense to keep it in Color.h
• Replaces rgb() function in Color with asSimpleColor() for symmetry with asExtended().
• Replaced std::max(a, std::min(value, b)) with std::clamp(value, a, b) for clarity.

• css/parser/CSSParserFastPaths.cpp:

(WebCore::fastParseColorInternal):
(WebCore::CSSParserFastPaths::parseColor):

• css/parser/CSSPropertyParserHelpers.cpp:

(WebCore::CSSPropertyParserHelpers::parseRGBParameters):
(WebCore::CSSPropertyParserHelpers::parseHSLParameters):
(WebCore::CSSPropertyParserHelpers::parseHexColor):

• editing/CompositionHighlight.h:
• editing/cocoa/DataDetection.mm:

(WebCore::DataDetection::detectContentInRange):

• html/ColorInputType.cpp:

(WebCore::parseSimpleColorValue):

• html/HTMLElement.cpp:

(WebCore::parseColorStringWithCrazyLegacyRules):

• platform/adwaita/ScrollbarThemeAdwaita.cpp:
• platform/adwaita/ThemeAdwaita.cpp:

(WebCore::ThemeAdwaita::activeSelectionForegroundColor const):
(WebCore::ThemeAdwaita::activeSelectionBackgroundColor const):
(WebCore::ThemeAdwaita::inactiveSelectionForegroundColor const):

• platform/graphics/Color.cpp:

(WebCore::differenceSquared):
(WebCore::Color::Color):
(WebCore::Color::operator=):
(WebCore::Color::serialized const):
(WebCore::Color::cssText const):
(WebCore::Color::nameForRenderTreeAsText const):
(WebCore::Color::light const):
(WebCore::Color::dark const):
(WebCore::Color::blend const):
(WebCore::Color::blendWithWhite const):
(WebCore::Color::colorWithAlpha const):
(WebCore::Color::colorWithAlphaUsingAlternativeRounding const):
(WebCore::Color::invertedColorWithAlpha const):
(WebCore::Color::colorSpaceAndComponents const):
(WebCore::Color::toSRGBASimpleColorLossy const):
(WebCore::blend):
(WebCore::Color::tagAsValid):
(WebCore::parseHexColorInternal): Deleted.
(WebCore::Color::parseHexColor): Deleted.
(WebCore::Color::asExtended const): Deleted.

• platform/graphics/Color.h:

(WebCore::Color::Color):
(WebCore::Color::isHashTableDeletedValue const):
(WebCore::Color::isValid const):
(WebCore::Color::isOpaque const):
(WebCore::Color::isVisible const):
(WebCore::Color::alpha const):
(WebCore::Color::alphaAsFloat const):
(WebCore::Color::isSemantic const):
(WebCore::Color::isExtended const):
(WebCore::Color::setIsSemantic):
(WebCore::operator==):
(WebCore::equalIgnoringSemanticColor):
(WebCore::Color::hash const):
(WebCore::Color::asExtended const):
(WebCore::Color::asSimpleColor const):
(WebCore::Color::setSimpleColor):
(WebCore::Color::isBlackColor):
(WebCore::Color::isWhiteColor):
(WebCore::Color::encode const):
(WebCore::Color::decode):
(WebCore::Color::setRGB): Deleted.
(WebCore::Color::rgb const): Deleted.

• platform/graphics/ColorUtilities.h:

(WebCore::clampedColorComponent):

• platform/graphics/ImageBackingStore.h:

(WebCore::ImageBackingStore::blendPixel):
(WebCore::ImageBackingStore::pixelValue const):

• platform/graphics/SimpleColor.cpp:

(WebCore::makePremultipliedSimpleColor):
(WebCore::makeUnpremultipliedSimpleColor):
(WebCore::makeSimpleColorFromFloats):
(WebCore::makeSimpleColorFromHSLA):
(WebCore::makeSimpleColorFromCMYKA):
(WebCore::parseHexColorInternal):
(WebCore::SimpleColor::parseHexColor):
(WebCore::makePremultipliedRGBA): Deleted.
(WebCore::makeUnPremultipliedRGBA): Deleted.
(WebCore::makeRGBA32FromFloats): Deleted.
(WebCore::makeRGBAFromHSLA): Deleted.
(WebCore::makeRGBAFromCMYKA): Deleted.

• platform/graphics/SimpleColor.h:

(WebCore::roundAndClampColorChannel):
(WebCore::colorFloatToSimpleColorByte):
(WebCore::makeSimpleColor):
(WebCore::colorFloatToRGBAByte): Deleted.
(WebCore::makeRGB): Deleted.
(WebCore::makeRGBA): Deleted.

• platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp:

(WebCore::makeSimpleColorFromARGBCFArray):
(WebCore::InbandTextTrackPrivateAVF::processCueAttributes):
(WebCore::makeRGBA32FromARGBCFArray): Deleted.

• platform/graphics/cairo/ImageBufferCairoImageSurfaceBackend.cpp:

(WebCore::ImageBufferCairoImageSurfaceBackend::platformTransformColorSpace):

• platform/graphics/cairo/NativeImageCairo.cpp:

(WebCore::nativeImageSinglePixelSolidColor):

• platform/graphics/cg/ColorCG.cpp:

(WebCore::makeSimpleColorFromCGColor):
(WebCore::Color::Color):
(WebCore::cachedCGColor):
(WebCore::makeRGBAFromCGColor): Deleted.

• platform/graphics/gtk/ColorGtk.cpp:

(WebCore::Color::Color):

• platform/graphics/mac/ColorMac.mm:

(WebCore::makeSimpleColorFromNSColor):
(WebCore::colorFromNSColor):
(WebCore::semanticColorFromNSColor):
(WebCore::makeRGBAFromNSColor): Deleted.

• platform/graphics/win/ColorDirect2D.cpp:

(WebCore::Color::Color):

• platform/graphics/win/GraphicsContextCGWin.cpp:

(WebCore::GraphicsContext::drawDotsForDocumentMarker):

• platform/graphics/win/PlatformContextDirect2D.cpp:

(WebCore::PlatformContextDirect2D::brushWithColor):

• platform/ios/ColorIOS.mm:

(WebCore::colorFromUIColor):

• rendering/InlineTextBox.cpp:

(WebCore::InlineTextBox::paintCompositionBackground):

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::paintResizer):

• rendering/RenderLayerBacking.cpp:

(WebCore::patternForTouchAction):
(WebCore::patternForEventListenerRegionType):

• rendering/RenderThemeAdwaita.cpp:
• rendering/RenderThemeMac.mm:

(WebCore::menuBackgroundColor):

Source/WebKit:

• UIProcess/ios/WKContentViewInteraction.mm:

(compositionHighlights):
Update for new name of CompositionHighlight::defaultCompositionFillColor.

Tools:

• TestWebKitAPI/Tests/WebCore/ColorTests.cpp:

(TestWebKitAPI::TEST):
Update test for rename of makeRGBAFromHSLA to makeSimpleColorFromHSLA.

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/parser/CSSParserFastPaths.cpp (modified) (4 diffs)
• Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp (modified) (5 diffs)
• Source/WebCore/editing/CompositionHighlight.h (modified) (1 diff)
• Source/WebCore/editing/cocoa/DataDetection.mm (modified) (1 diff)
• Source/WebCore/html/ColorInputType.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLElement.cpp (modified) (3 diffs)
• Source/WebCore/platform/adwaita/ScrollbarThemeAdwaita.cpp (modified) (1 diff)
• Source/WebCore/platform/adwaita/ThemeAdwaita.cpp (modified) (2 diffs)
• Source/WebCore/platform/graphics/Color.cpp (modified) (21 diffs)
• Source/WebCore/platform/graphics/Color.h (modified) (21 diffs)
• Source/WebCore/platform/graphics/ColorUtilities.h (modified) (1 diff)
• Source/WebCore/platform/graphics/ImageBackingStore.h (modified) (3 diffs)
• Source/WebCore/platform/graphics/SimpleColor.cpp (modified) (4 diffs)
• Source/WebCore/platform/graphics/SimpleColor.h (modified) (7 diffs)
• Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp (modified) (5 diffs)
• Source/WebCore/platform/graphics/cairo/ImageBufferCairoImageSurfaceBackend.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/cairo/NativeImageCairo.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/cg/ColorCG.cpp (modified) (4 diffs)
• Source/WebCore/platform/graphics/gtk/ColorGtk.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/mac/ColorMac.mm (modified) (3 diffs)
• Source/WebCore/platform/graphics/win/ColorDirect2D.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/win/GraphicsContextCGWin.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/win/PlatformContextDirect2D.cpp (modified) (1 diff)
• Source/WebCore/platform/ios/ColorIOS.mm (modified) (2 diffs)
• Source/WebCore/rendering/InlineTextBox.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderLayerBacking.cpp (modified) (3 diffs)
• Source/WebCore/rendering/RenderThemeAdwaita.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderThemeMac.mm (modified) (2 diffs)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebCore/ColorTests.cpp (modified) (8 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-05-24  Sam Weinig  <weinig@apple.com>
+
+        Extended Color Cleanup: Use the name SimpleColor consistently
+        https://bugs.webkit.org/show_bug.cgi?id=212337
+
+        Reviewed by Anders Carlsson.
+        
+        - Removes RGBA32 type alias, updating all remaining users of it.
+        - Renames functions that take/return SimpleColor to use the name
+          SimpleColor rather than RGB (e.g. makeRGBA -> makeSimpleColor)
+        - Moves hex color parsing from Color to SimpleColor, as that is
+          the type it returns. Also took the opportunity to make it return
+          an Optional<SimpleColor> instead of using a bool/out parameter.
+        - Move Color::compositionFill to editing/CompositionHighlight.h
+          It makes no real sense to keep it in Color.h
+        - Replaces rgb() function in Color with asSimpleColor() for 
+          symmetry with asExtended().
+        - Replaced std::max(a, std::min(value, b)) with std::clamp(value, a, b)
+          for clarity.
+
+        * css/parser/CSSParserFastPaths.cpp:
+        (WebCore::fastParseColorInternal):
+        (WebCore::CSSParserFastPaths::parseColor):
+        * css/parser/CSSPropertyParserHelpers.cpp:
+        (WebCore::CSSPropertyParserHelpers::parseRGBParameters):
+        (WebCore::CSSPropertyParserHelpers::parseHSLParameters):
+        (WebCore::CSSPropertyParserHelpers::parseHexColor):
+        * editing/CompositionHighlight.h:
+        * editing/cocoa/DataDetection.mm:
+        (WebCore::DataDetection::detectContentInRange):
+        * html/ColorInputType.cpp:
+        (WebCore::parseSimpleColorValue):
+        * html/HTMLElement.cpp:
+        (WebCore::parseColorStringWithCrazyLegacyRules):
+        * platform/adwaita/ScrollbarThemeAdwaita.cpp:
+        * platform/adwaita/ThemeAdwaita.cpp:
+        (WebCore::ThemeAdwaita::activeSelectionForegroundColor const):
+        (WebCore::ThemeAdwaita::activeSelectionBackgroundColor const):
+        (WebCore::ThemeAdwaita::inactiveSelectionForegroundColor const):
+        * platform/graphics/Color.cpp:
+        (WebCore::differenceSquared):
+        (WebCore::Color::Color):
+        (WebCore::Color::operator=):
+        (WebCore::Color::serialized const):
+        (WebCore::Color::cssText const):
+        (WebCore::Color::nameForRenderTreeAsText const):
+        (WebCore::Color::light const):
+        (WebCore::Color::dark const):
+        (WebCore::Color::blend const):
+        (WebCore::Color::blendWithWhite const):
+        (WebCore::Color::colorWithAlpha const):
+        (WebCore::Color::colorWithAlphaUsingAlternativeRounding const):
+        (WebCore::Color::invertedColorWithAlpha const):
+        (WebCore::Color::colorSpaceAndComponents const):
+        (WebCore::Color::toSRGBASimpleColorLossy const):
+        (WebCore::blend):
+        (WebCore::Color::tagAsValid):
+        (WebCore::parseHexColorInternal): Deleted.
+        (WebCore::Color::parseHexColor): Deleted.
+        (WebCore::Color::asExtended const): Deleted.
+        * platform/graphics/Color.h:
+        (WebCore::Color::Color):
+        (WebCore::Color::isHashTableDeletedValue const):
+        (WebCore::Color::isValid const):
+        (WebCore::Color::isOpaque const):
+        (WebCore::Color::isVisible const):
+        (WebCore::Color::alpha const):
+        (WebCore::Color::alphaAsFloat const):
+        (WebCore::Color::isSemantic const):
+        (WebCore::Color::isExtended const):
+        (WebCore::Color::setIsSemantic):
+        (WebCore::operator==):
+        (WebCore::equalIgnoringSemanticColor):
+        (WebCore::Color::hash const):
+        (WebCore::Color::asExtended const):
+        (WebCore::Color::asSimpleColor const):
+        (WebCore::Color::setSimpleColor):
+        (WebCore::Color::isBlackColor):
+        (WebCore::Color::isWhiteColor):
+        (WebCore::Color::encode const):
+        (WebCore::Color::decode):
+        (WebCore::Color::setRGB): Deleted.
+        (WebCore::Color::rgb const): Deleted.
+        * platform/graphics/ColorUtilities.h:
+        (WebCore::clampedColorComponent):
+        * platform/graphics/ImageBackingStore.h:
+        (WebCore::ImageBackingStore::blendPixel):
+        (WebCore::ImageBackingStore::pixelValue const):
+        * platform/graphics/SimpleColor.cpp:
+        (WebCore::makePremultipliedSimpleColor):
+        (WebCore::makeUnpremultipliedSimpleColor):
+        (WebCore::makeSimpleColorFromFloats):
+        (WebCore::makeSimpleColorFromHSLA):
+        (WebCore::makeSimpleColorFromCMYKA):
+        (WebCore::parseHexColorInternal):
+        (WebCore::SimpleColor::parseHexColor):
+        (WebCore::makePremultipliedRGBA): Deleted.
+        (WebCore::makeUnPremultipliedRGBA): Deleted.
+        (WebCore::makeRGBA32FromFloats): Deleted.
+        (WebCore::makeRGBAFromHSLA): Deleted.
+        (WebCore::makeRGBAFromCMYKA): Deleted.
+        * platform/graphics/SimpleColor.h:
+        (WebCore::roundAndClampColorChannel):
+        (WebCore::colorFloatToSimpleColorByte):
+        (WebCore::makeSimpleColor):
+        (WebCore::colorFloatToRGBAByte): Deleted.
+        (WebCore::makeRGB): Deleted.
+        (WebCore::makeRGBA): Deleted.
+        * platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp:
+        (WebCore::makeSimpleColorFromARGBCFArray):
+        (WebCore::InbandTextTrackPrivateAVF::processCueAttributes):
+        (WebCore::makeRGBA32FromARGBCFArray): Deleted.
+        * platform/graphics/cairo/ImageBufferCairoImageSurfaceBackend.cpp:
+        (WebCore::ImageBufferCairoImageSurfaceBackend::platformTransformColorSpace):
+        * platform/graphics/cairo/NativeImageCairo.cpp:
+        (WebCore::nativeImageSinglePixelSolidColor):
+        * platform/graphics/cg/ColorCG.cpp:
+        (WebCore::makeSimpleColorFromCGColor):
+        (WebCore::Color::Color):
+        (WebCore::cachedCGColor):
+        (WebCore::makeRGBAFromCGColor): Deleted.
+        * platform/graphics/gtk/ColorGtk.cpp:
+        (WebCore::Color::Color):
+        * platform/graphics/mac/ColorMac.mm:
+        (WebCore::makeSimpleColorFromNSColor):
+        (WebCore::colorFromNSColor):
+        (WebCore::semanticColorFromNSColor):
+        (WebCore::makeRGBAFromNSColor): Deleted.
+        * platform/graphics/win/ColorDirect2D.cpp:
+        (WebCore::Color::Color):
+        * platform/graphics/win/GraphicsContextCGWin.cpp:
+        (WebCore::GraphicsContext::drawDotsForDocumentMarker):
+        * platform/graphics/win/PlatformContextDirect2D.cpp:
+        (WebCore::PlatformContextDirect2D::brushWithColor):
+        * platform/ios/ColorIOS.mm:
+        (WebCore::colorFromUIColor):
+        * rendering/InlineTextBox.cpp:
+        (WebCore::InlineTextBox::paintCompositionBackground):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::paintResizer):
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::patternForTouchAction):
+        (WebCore::patternForEventListenerRegionType):
+        * rendering/RenderThemeAdwaita.cpp:
+        * rendering/RenderThemeMac.mm:
+        (WebCore::menuBackgroundColor):
+
 2020-05-25  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp

@@ -410 +410 @@
 
 template <typename CharacterType>
-static Color fastParseColorInternal(const CharacterType* characters, unsigned length, bool quirksMode)
+static Optional<SimpleColor> fastParseColorInternal(const CharacterType* characters, unsigned length, bool quirksMode)
 {
     CSSUnitType expect = CSSUnitType::CSS_UNKNOWN;
 
     if (length >= 4 && characters[0] == '#') {
-        RGBA32 rgb;
-        if (Color::parseHexColor(characters + 1, length - 1, rgb))
-            return Color(rgb);
+        if (auto color = SimpleColor::parseHexColor(characters + 1, length - 1))
+            return color;
     }
 
     if (quirksMode && (length == 3 || length == 6)) {
-        RGBA32 rgb;
-        if (Color::parseHexColor(characters, length, rgb))
-            return Color(rgb);
+        if (auto color = SimpleColor::parseHexColor(characters, length))
+            return color;
     }
 
@@ -436 +434 @@
 
         if (!parseColorIntOrPercentage(current, end, ',', expect, red))
-            return Color();
+            return WTF::nullopt;
         if (!parseColorIntOrPercentage(current, end, ',', expect, green))
-            return Color();
+            return WTF::nullopt;
         if (!parseColorIntOrPercentage(current, end, ',', expect, blue))
-            return Color();
+            return WTF::nullopt;
         if (!parseAlphaValue(current, end, ')', alpha))
-            return Color();
+            return WTF::nullopt;
         if (current != end)
-            return Color();
-        return Color(makeRGBA(red, green, blue, alpha));
+            return WTF::nullopt;
+        return makeSimpleColor(red, green, blue, alpha);
     }
 
@@ -456 +454 @@
         int blue;
         if (!parseColorIntOrPercentage(current, end, ',', expect, red))
-            return Color();
+            return WTF::nullopt;
         if (!parseColorIntOrPercentage(current, end, ',', expect, green))
-            return Color();
+            return WTF::nullopt;
         if (!parseColorIntOrPercentage(current, end, ')', expect, blue))
-            return Color();
+            return WTF::nullopt;
         if (current != end)
-            return Color();
-        return Color(makeRGB(red, green, blue));
-    }
-
-    return Color();
+            return WTF::nullopt;
+        return makeSimpleColor(red, green, blue);
+    }
+
+    return WTF::nullopt;
 }
 
@@ -482 +480 @@
 
     // Fast path for hex colors and rgb()/rgba() colors
-    Color color;
+    Optional<SimpleColor> color;
     if (string.is8Bit())
         color = fastParseColorInternal(string.characters8(), string.length(), quirksMode);
     else
         color = fastParseColorInternal(string.characters16(), string.length(), quirksMode);
-    if (!color.isValid())
+    if (!color)
         return nullptr;
-    return valuePool.createColorValue(color);
+    return valuePool.createColorValue(*color);
 }
 

trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp

@@ -530 +530 @@
 {
     ASSERT(range.peek().functionId() == CSSValueRgb || range.peek().functionId() == CSSValueRgba);
-    Color result;
     CSSParserTokenRange args = consumeFunction(range);
     RefPtr<CSSPrimitiveValue> colorParameter = consumeNumber(args, ValueRangeAll);
@@ -589 +588 @@
     };
 
-    result = Color(makeRGBA(colorArray[0], colorArray[1], colorArray[2], alphaComponent));
-
     if (!args.atEnd())
         return Color();
 
-    return result;
+    return makeSimpleColor(colorArray[0], colorArray[1], colorArray[2], alphaComponent);
 }
 
@@ -646 +643 @@
         return Color();
 
-    return Color(makeRGBAFromHSLA(static_cast<float>(colorArray[0]), static_cast<float>(colorArray[1]), static_cast<float>(colorArray[2]), static_cast<float>(alpha)));
+    return makeSimpleColorFromHSLA(static_cast<float>(colorArray[0]), static_cast<float>(colorArray[1]), static_cast<float>(colorArray[2]), static_cast<float>(alpha));
 }
 
@@ -696 +693 @@
 static Color parseHexColor(CSSParserTokenRange& range, bool acceptQuirkyColors)
 {
-    RGBA32 result;
+    SimpleColor result;
     const CSSParserToken& token = range.peek();
     if (token.type() == HashToken) {
-        if (!Color::parseHexColor(token.value(), result))
+        auto simpleColor = SimpleColor::parseHexColor(token.value());
+        if (!simpleColor)
             return Color();
+        result = *simpleColor;
     } else if (acceptQuirkyColors) {
         String color;
@@ -719 +718 @@
         if (length != 3 && length != 6)
             return Color();
-        if (!Color::parseHexColor(color, result))
+        auto simpleColor = SimpleColor::parseHexColor(color);
+        if (!simpleColor)
             return Color();
+        result = *simpleColor;
     } else {
         return Color();
     }
     range.consumeIncludingWhitespace();
-    return Color(result);
+    return result;
 }
 

trunk/Source/WebCore/editing/CompositionHighlight.h

@@ -40 +40 @@
     }
 
+#if PLATFORM(IOS_FAMILY)
+    static constexpr SimpleColor defaultCompositionFillColor { 0x3CAFC0E3 };
+#else
+    static constexpr SimpleColor defaultCompositionFillColor { 0xFFE1DD55 };
+#endif
+
     unsigned startOffset { 0 };
     unsigned endOffset { 0 };
-    Color color { Color::compositionFill };
+    Color color { defaultCompositionFillColor };
 
     template<class Encoder> void encode(Encoder&) const;

trunk/Source/WebCore/editing/cocoa/DataDetection.mm

@@ -626 +626 @@
                         double overrideLightness = 0.5;
                         double overrideAlphaMultiplier = 0.38;
-                        auto underlineColor = Color(makeRGBAFromHSLA(hue, saturation, overrideLightness, overrideAlphaMultiplier * alpha));
+                        auto underlineColor = makeSimpleColorFromHSLA(hue, saturation, overrideLightness, overrideAlphaMultiplier * alpha);
 
                         anchorElement->setInlineStyleProperty(CSSPropertyColor, CSSValueCurrentcolor);
-                        anchorElement->setInlineStyleProperty(CSSPropertyTextDecorationColor, underlineColor.cssText());
+                        anchorElement->setInlineStyleProperty(CSSPropertyTextDecorationColor, underlineColor.serializationForCSS());
                     }
                 }

trunk/Source/WebCore/html/ColorInputType.cpp

@@ -69 +69 @@
 
 // https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#rules-for-parsing-simple-colour-values
-static Optional<RGBA32> parseSimpleColorValue(StringView string)
+static Optional<SimpleColor> parseSimpleColorValue(StringView string)
 {
     if (!isValidSimpleColor(string))
         return WTF::nullopt;
-    return makeRGB(toASCIIHexValue(string[1], string[2]), toASCIIHexValue(string[3], string[4]), toASCIIHexValue(string[5], string[6]));
+    return makeSimpleColor(toASCIIHexValue(string[1], string[2]), toASCIIHexValue(string[3], string[4]), toASCIIHexValue(string[5], string[6]));
 }
 

trunk/Source/WebCore/html/HTMLElement.cpp

@@ -974 +974 @@
 }
 
-static RGBA32 parseColorStringWithCrazyLegacyRules(const String& colorString)
+static SimpleColor parseColorStringWithCrazyLegacyRules(const String& colorString)
 {
     // Per spec, only look at the first 128 digits of the string.
@@ -1003 +1003 @@
 
     if (digitBuffer.size() < 6)
-        return makeRGB(toASCIIHexValue(digitBuffer[0]), toASCIIHexValue(digitBuffer[1]), toASCIIHexValue(digitBuffer[2]));
+        return makeSimpleColor(toASCIIHexValue(digitBuffer[0]), toASCIIHexValue(digitBuffer[1]), toASCIIHexValue(digitBuffer[2]));
 
     // Split the digits into three components, then search the last 8 digits of each component.
@@ -1027 +1027 @@
     int greenValue = toASCIIHexValue(digitBuffer[greenIndex], digitBuffer[greenIndex + 1]);
     int blueValue = toASCIIHexValue(digitBuffer[blueIndex], digitBuffer[blueIndex + 1]);
-    return makeRGB(redValue, greenValue, blueValue);
+    return makeSimpleColor(redValue, greenValue, blueValue);
 }
 

trunk/Source/WebCore/platform/adwaita/ScrollbarThemeAdwaita.cpp

@@ -44 +44 @@
 static const unsigned thumbSize = 6;
 static const double scrollbarOpacity = 0.8;
-static const Color scrollbarBackgroundColor = makeRGB(252, 252, 252);
-static const Color scrollbarBorderColor = makeRGB(220, 223, 227);
-static const Color overlayThumbBorderColor = makeRGBA(255, 255, 255, 100);
-static const Color overlayThumbColor = makeRGBA(46, 52, 54, 100);
-static const Color thumbHoveredColor = makeRGB(86, 91, 92);
-static const Color thumbPressedColor = makeRGB(27, 106, 203);
-static const Color thumbColor = makeRGB(126, 129, 130);
+static const Color scrollbarBackgroundColor = makeSimpleColor(252, 252, 252);
+static const Color scrollbarBorderColor = makeSimpleColor(220, 223, 227);
+static const Color overlayThumbBorderColor = makeSimpleColor(255, 255, 255, 100);
+static const Color overlayThumbColor = makeSimpleColor(46, 52, 54, 100);
+static const Color thumbHoveredColor = makeSimpleColor(86, 91, 92);
+static const Color thumbPressedColor = makeSimpleColor(27, 106, 203);
+static const Color thumbColor = makeSimpleColor(126, 129, 130);
 
 bool ScrollbarThemeAdwaita::usesOverlayScrollbars() const

trunk/Source/WebCore/platform/adwaita/ThemeAdwaita.cpp

@@ -37 +37 @@
 
 static const unsigned focusLineWidth = 1;
-static const Color focusRingColor = makeRGBA(46, 52, 54, 150);
+static const Color focusRingColor = makeSimpleColor(46, 52, 54, 150);
 static const unsigned arrowSize = 16;
-static const Color arrowColor = makeRGB(46, 52, 54);
+static const Color arrowColor = makeSimpleColor(46, 52, 54);
 static const int buttonFocusOffset = -3;
 static const unsigned buttonPadding = 5;
 static const int buttonBorderSize = 1; // Keep in sync with menuListButtonBorderSize in RenderThemeAdwaita.
-static const Color buttonBorderColor = makeRGB(205, 199, 194);
-static const Color buttonBackgroundColor = makeRGB(244, 242, 241);
-static const Color buttonBackgroundPressedColor = makeRGB(214, 209, 205);
-static const Color buttonBackgroundHoveredColor = makeRGB(248, 248, 247);
-static const Color buttonBackgroundDisabledColor = makeRGB(246, 246, 244);
-static const Color toggleBackgroundColor = makeRGB(255, 255, 255);
-static const Color toggleBackgroundHoveredColor = makeRGB(242, 242, 242);
-static const Color toggleBackgroundDisabledColor = makeRGB(252, 252, 252);
+static const Color buttonBorderColor = makeSimpleColor(205, 199, 194);
+static const Color buttonBackgroundColor = makeSimpleColor(244, 242, 241);
+static const Color buttonBackgroundPressedColor = makeSimpleColor(214, 209, 205);
+static const Color buttonBackgroundHoveredColor = makeSimpleColor(248, 248, 247);
+static const Color buttonBackgroundDisabledColor = makeSimpleColor(246, 246, 244);
+static const Color toggleBackgroundColor = makeSimpleColor(255, 255, 255);
+static const Color toggleBackgroundHoveredColor = makeSimpleColor(242, 242, 242);
+static const Color toggleBackgroundDisabledColor = makeSimpleColor(252, 252, 252);
 static const double toggleSize = 14.;
 static const int toggleFocusOffset = 2;
-static const Color toggleColor = makeRGB(46, 52, 54);
-static const Color toggleDisabledColor = makeRGB(160, 160, 160);
-static const Color spinButtonBorderColor = makeRGB(220, 223, 227);
-static const Color spinButtonBackgroundColor = makeRGB(252, 252, 252);
-static const Color spinButtonBackgroundHoveredColor = makeRGBA(46, 52, 54, 50);
-static const Color spinButtonBackgroundPressedColor = makeRGBA(46, 52, 54, 70);
+static const Color toggleColor = makeSimpleColor(46, 52, 54);
+static const Color toggleDisabledColor = makeSimpleColor(160, 160, 160);
+static const Color spinButtonBorderColor = makeSimpleColor(220, 223, 227);
+static const Color spinButtonBackgroundColor = makeSimpleColor(252, 252, 252);
+static const Color spinButtonBackgroundHoveredColor = makeSimpleColor(46, 52, 54, 50);
+static const Color spinButtonBackgroundPressedColor = makeSimpleColor(46, 52, 54, 70);
 
 #if !PLATFORM(GTK) || USE(GTK4)
@@ -70 +70 @@
 Color ThemeAdwaita::activeSelectionForegroundColor() const
 {
-    return makeRGB(255, 255, 255);
+    return makeSimpleColor(255, 255, 255);
 }
 
 Color ThemeAdwaita::activeSelectionBackgroundColor() const
 {
-    return makeRGB(52, 132, 228);
+    return makeSimpleColor(52, 132, 228);
 }
 
 Color ThemeAdwaita::inactiveSelectionForegroundColor() const
 {
-    return makeRGB(252, 252, 252);
+    return makeSimpleColor(252, 252, 252);
 }
 

trunk/Source/WebCore/platform/graphics/Color.cpp

@@ -31 +31 @@
 #include "HashTools.h"
 #include <wtf/Assertions.h>
-#include <wtf/HexNumber.h>
 #include <wtf/MathExtras.h>
 #include <wtf/text/StringBuilder.h>
@@ -40 +39 @@
 static constexpr SimpleColor lightenedBlack { 0xFF545454 };
 static constexpr SimpleColor darkenedWhite { 0xFFABABAB };
-
-// originally moved here from the CSS parser
-template <typename CharacterType>
-static inline bool parseHexColorInternal(const CharacterType* name, unsigned length, RGBA32& rgb)
-{
-    if (length != 3 && length != 4 && length != 6 && length != 8)
-        return false;
-    unsigned value = 0;
-    for (unsigned i = 0; i < length; ++i) {
-        if (!isASCIIHexDigit(name[i]))
-            return false;
-        value <<= 4;
-        value |= toASCIIHexValue(name[i]);
-    }
-    if (length == 6) {
-        rgb = { 0xFF000000 | value };
-        return true;
-    }
-    if (length == 8) {
-        // We parsed the values into RGBA order, but the RGBA32 type
-        // expects them to be in ARGB order, so we right rotate eight bits.
-        rgb = { value << 24 | value >> 8 };
-        return true;
-    }
-    if (length == 4) {
-        // #abcd converts to ddaabbcc in RGBA32.
-        rgb = { (value & 0xF) << 28 | (value & 0xF) << 24
-            | (value & 0xF000) << 8 | (value & 0xF000) << 4
-            | (value & 0xF00) << 4 | (value & 0xF00)
-            | (value & 0xF0) | (value & 0xF0) >> 4 };
-        return true;
-    }
-    // #abc converts to #aabbcc
-    rgb = { 0xFF000000
-        | (value & 0xF00) << 12 | (value & 0xF00) << 8
-        | (value & 0xF0) << 8 | (value & 0xF0) << 4
-        | (value & 0xF) << 4 | (value & 0xF) };
-    return true;
-}
-
-bool Color::parseHexColor(const LChar* name, unsigned length, RGBA32& rgb)
-{
-    return parseHexColorInternal(name, length, rgb);
-}
-
-bool Color::parseHexColor(const UChar* name, unsigned length, RGBA32& rgb)
-{
-    return parseHexColorInternal(name, length, rgb);
-}
-
-bool Color::parseHexColor(const String& name, RGBA32& rgb)
-{
-    unsigned length = name.length();
-    if (!length)
-        return false;
-    if (name.is8Bit())
-        return parseHexColor(name.characters8(), name.length(), rgb);
-    return parseHexColor(name.characters16(), name.length(), rgb);
-}
-
-bool Color::parseHexColor(const StringView& name, RGBA32& rgb)
-{
-    unsigned length = name.length();
-    if (!length)
-        return false;
-    if (name.is8Bit())
-        return parseHexColor(name.characters8(), name.length(), rgb);
-    return parseHexColor(name.characters16(), name.length(), rgb);
-}
 
 int differenceSquared(const Color& c1, const Color& c2)
@@ -116 +46 @@
     // sites have picked comparison values based on feel. We'd need to break out
     // our logarithm tables to change them :)
-    int c1Red = c1.isExtended() ? c1.asExtended().red() * 255 : c1.rgb().redComponent();
-    int c1Green = c1.isExtended() ? c1.asExtended().green() * 255 : c1.rgb().greenComponent();
-    int c1Blue = c1.isExtended() ? c1.asExtended().blue() * 255 : c1.rgb().blueComponent();
-    int c2Red = c2.isExtended() ? c2.asExtended().red() * 255 : c2.rgb().redComponent();
-    int c2Green = c2.isExtended() ? c2.asExtended().green() * 255 : c2.rgb().greenComponent();
-    int c2Blue = c2.isExtended() ? c2.asExtended().blue() * 255 : c2.rgb().blueComponent();
+    int c1Red = c1.isExtended() ? c1.asExtended().red() * 255 : c1.asSimpleColor().redComponent();
+    int c1Green = c1.isExtended() ? c1.asExtended().green() * 255 : c1.asSimpleColor().greenComponent();
+    int c1Blue = c1.isExtended() ? c1.asExtended().blue() * 255 : c1.asSimpleColor().blueComponent();
+    int c2Red = c2.isExtended() ? c2.asExtended().red() * 255 : c2.asSimpleColor().redComponent();
+    int c2Green = c2.isExtended() ? c2.asExtended().green() * 255 : c2.asSimpleColor().greenComponent();
+    int c2Blue = c2.isExtended() ? c2.asExtended().blue() * 255 : c2.asSimpleColor().blueComponent();
     int dR = c1Red - c2Red;
     int dG = c1Green - c2Green;
@@ -147 +77 @@
 {
     if (name[0] == '#') {
-        RGBA32 color;
-        bool valid;
-
+        Optional<SimpleColor> color;
         if (name.is8Bit())
-            valid = parseHexColor(name.characters8() + 1, name.length() - 1, color);
+            color = SimpleColor::parseHexColor(name.characters8() + 1, name.length() - 1);
         else
-            valid = parseHexColor(name.characters16() + 1, name.length() - 1, color);
-
-        if (valid)
-            setRGB(color);
+            color = SimpleColor::parseHexColor(name.characters16() + 1, name.length() - 1);
+
+        if (color)
+            setSimpleColor(*color);
     } else {
         if (auto* foundColor = findNamedColor(name))
-            setRGB({ foundColor->ARGBValue });
+            setSimpleColor({ foundColor->ARGBValue });
     }
 }
@@ -166 +94 @@
 {
     if (name[0] == '#') {
-        SimpleColor color;
-        if (parseHexColor(reinterpret_cast<const LChar*>(&name[1]), std::strlen(&name[1]), color))
-            setRGB(color);
+        auto color = SimpleColor::parseHexColor(reinterpret_cast<const LChar*>(&name[1]), std::strlen(&name[1]));
+        if (color)
+            setSimpleColor(*color);
     } else if (auto* foundColor = findColor(name, strlen(name)))
-        setRGB({ foundColor->ARGBValue });
+        setSimpleColor({ foundColor->ARGBValue });
 }
 
@@ -193 +121 @@
 {
     // Zero the union, just in case a 32-bit system only assigns the
-    // top 32 bits when copying the extendedColor pointer below.
-    m_colorData.rgbaAndFlags = 0;
+    // top 32 bits when copying the ExtendedColor pointer below.
+    m_colorData.simpleColorAndFlags = 0;
     m_colorData.extendedColor = &extendedColor.leakRef();
     ASSERT(isExtended());
@@ -223 +151 @@
 
     m_colorData = other.m_colorData;
-    other.m_colorData.rgbaAndFlags = invalidRGBAColor;
+    other.m_colorData.simpleColorAndFlags = invalidSimpleColor;
 
     return *this;
@@ -232 +160 @@
     if (isExtended())
         return asExtended().cssText();
-    return rgb().serializationForHTML();
+    return asSimpleColor().serializationForHTML();
 }
 
@@ -239 +167 @@
     if (isExtended())
         return asExtended().cssText();
-    return rgb().serializationForCSS();
+    return asSimpleColor().serializationForCSS();
 }
 
 String Color::nameForRenderTreeAsText() const
 {
-    // FIXME: Handle extended colors.
-    return rgb().serializationForRenderTreeAsText();
+    return asSimpleColor().serializationForRenderTreeAsText();
 }
 
@@ -251 +178 @@
 {
     // Hardcode this common case for speed.
-    if (rgb() == black)
+    if (asSimpleColor() == black)
         return lightenedBlack;
     
@@ -276 +203 @@
 {
     // Hardcode this common case for speed.
-    if (rgb() == white)
+    if (asSimpleColor() == white)
         return darkenedWhite;
     
@@ -325 +252 @@
     int b = (selfB * selfA * (0xFF - sourceA) + 0xFF * sourceA * sourceB) / d;
 
-    return makeRGBA(r, g, b, a);
+    return makeSimpleColor(r, g, b, a);
 }
 
@@ -355 +282 @@
         int b = blendComponent(existingB, alpha);
         
-        result = makeRGBA(r, g, b, alpha);
+        result = makeSimpleColor(r, g, b, alpha);
 
         if (r >= 0 && g >= 0 && b >= 0)
@@ -389 +316 @@
     uint8_t newAlpha = alpha * 0xFF;
 
-    Color result = rgb().colorWithAlpha(newAlpha);
+    Color result = asSimpleColor().colorWithAlpha(newAlpha);
     if (isSemantic())
         result.setIsSemantic();
@@ -403 +330 @@
 
     // FIXME: This is where this function differs from colorWithAlphaUsing.
-    uint8_t newAlpha = colorFloatToRGBAByte(alpha);
-
-    Color result = rgb().colorWithAlpha(newAlpha);
+    uint8_t newAlpha = colorFloatToSimpleColorByte(alpha);
+
+    Color result = asSimpleColor().colorWithAlpha(newAlpha);
     if (isSemantic())
         result.setIsSemantic();
@@ -416 +343 @@
         return Color { asExtended().invertedColorWithAlpha(alpha) };
 
-    auto [r, g, b, existingAlpha] = rgb();
-    return { 0xFF - r, 0xFF - g, 0xFF - b, colorFloatToRGBAByte(alpha) };
+    auto [r, g, b, existingAlpha] = asSimpleColor();
+    return { 0xFF - r, 0xFF - g, 0xFF - b, colorFloatToSimpleColorByte(alpha) };
 }
 
@@ -435 +362 @@
     }
 
-    auto [r, g, b, a] = rgb();
+    auto [r, g, b, a] = asSimpleColor();
     return { ColorSpace::SRGB, FloatComponents { r / 255.0f, g / 255.0f, b / 255.0f,  a / 255.0f } };
 }
@@ -441 +368 @@
 SimpleColor Color::toSRGBASimpleColorLossy() const
 {
-    if (!isExtended())
-        return rgb();
-
-    auto [r, g, b, a] = toSRGBAComponentsLossy();
-    return makeRGBA32FromFloats(r, g, b, a);
+    if (isExtended()) {
+        auto [r, g, b, a] = toSRGBAComponentsLossy();
+        return makeSimpleColorFromFloats(r, g, b, a);
+    }
+
+    return asSimpleColor();
 }
 
@@ -477 +405 @@
     // We need to preserve the state of the valid flag at the end of the animation
     if (progress == 1 && !to.isValid())
-        return Color();
-
-    // Since makePremultipliedRGBA() bails on zero alpha, special-case that.
-    auto premultFrom = from.alpha() ? makePremultipliedRGBA(from.toSRGBASimpleColorLossy()) : Color::transparent;
-    auto premultTo = to.alpha() ? makePremultipliedRGBA(to.toSRGBASimpleColorLossy()) : Color::transparent;
-
-    RGBA32 premultBlended = makeRGBA(
+        return { };
+
+    // Since makePremultipliedSimpleColor() bails on zero alpha, special-case that.
+    auto premultFrom = from.alpha() ? makePremultipliedSimpleColor(from.toSRGBASimpleColorLossy()) : Color::transparent;
+    auto premultTo = to.alpha() ? makePremultipliedSimpleColor(to.toSRGBASimpleColorLossy()) : Color::transparent;
+
+    SimpleColor premultBlended = makeSimpleColor(
         WebCore::blend(premultFrom.redComponent(), premultTo.redComponent(), progress),
         WebCore::blend(premultFrom.greenComponent(), premultTo.greenComponent(), progress),
@@ -490 +418 @@
     );
 
-    return makeUnPremultipliedRGBA(premultBlended);
+    return makeUnpremultipliedSimpleColor(premultBlended);
 }
 
@@ -513 +441 @@
 void Color::tagAsValid()
 {
-    m_colorData.rgbaAndFlags |= validRGBAColor;
-}
-
-const ExtendedColor& Color::asExtended() const
-{
-    ASSERT(isExtended());
-    return *m_colorData.extendedColor;
+    m_colorData.simpleColorAndFlags |= validSimpleColor;
 }
 

trunk/Source/WebCore/platform/graphics/Color.h

@@ -29 +29 @@
 #include "ExtendedColor.h"
 #include "SimpleColor.h"
-#include <algorithm>
-#include <cmath>
-#include <unicode/uchar.h>
 #include <wtf/Forward.h>
 #include <wtf/HashFunctions.h>
 #include <wtf/Optional.h>
-#include <wtf/text/LChar.h>
 
 #if USE(CG)
@@ -65 +61 @@
     // FIXME: Remove all these constructors and creation functions and replace the ones that are still needed with free functions.
 
-    Color(RGBA32 color, bool valid = true)
+    Color(SimpleColor color, bool valid = true)
     {
         if (valid)
-            setRGB(color);
+            setSimpleColor(color);
     }
 
     enum SemanticTag { Semantic };
-    Color(RGBA32 color, SemanticTag)
-    {
-        setRGB(color);
+    Color(SimpleColor color, SemanticTag)
+    {
+        setSimpleColor(color);
         setIsSemantic();
     }
@@ -80 +76 @@
     Color(int r, int g, int b)
     {
-        setRGB(r, g, b);
+        setSimpleColor(makeSimpleColor(r, g, b));
     }
 
     Color(int r, int g, int b, int a)
     {
-        setRGB(makeRGBA(r, g, b, a));
+        setSimpleColor(makeSimpleColor(r, g, b, a));
     }
 
     Color(float r, float g, float b, float a)
     {
-        setRGB(makeRGBA32FromFloats(r, g, b, a));
+        setSimpleColor(makeSimpleColorFromFloats(r, g, b, a));
     }
 
@@ -96 +92 @@
     Color(float c, float m, float y, float k, float a)
     {
-        setRGB(makeRGBAFromCMYKA(c, m, y, k, a));
+        setSimpleColor(makeSimpleColorFromCMYKA(c, m, y, k, a));
     }
 
@@ -104 +100 @@
     explicit Color(WTF::HashTableDeletedValueType)
     {
-        static_assert(deletedHashValue & invalidRGBAColor, "Color's deleted hash value must not look like an ExtendedColor");
-        static_assert(!(deletedHashValue & validRGBAColorBit), "Color's deleted hash value must not look like a valid RGBA32 Color");
-        static_assert(deletedHashValue & (1 << 4), "Color's deleted hash value must have some bits set that an RGBA32 Color wouldn't have");
-        m_colorData.rgbaAndFlags = deletedHashValue;
+        static_assert(deletedHashValue & invalidSimpleColor, "Color's deleted hash value must not look like an ExtendedColor");
+        static_assert(!(deletedHashValue & validSimpleColorBit), "Color's deleted hash value must not look like a valid SimpleColor");
+        static_assert(deletedHashValue & (1 << 4), "Color's deleted hash value must have some bits set that an SimpleColor wouldn't have");
+        m_colorData.simpleColorAndFlags = deletedHashValue;
         ASSERT(!isExtended());
     }
@@ -113 +109 @@
     bool isHashTableDeletedValue() const
     {
-        return m_colorData.rgbaAndFlags == deletedHashValue;
+        return m_colorData.simpleColorAndFlags == deletedHashValue;
     }
 
     explicit Color(WTF::HashTableEmptyValueType)
     {
-        static_assert(emptyHashValue & invalidRGBAColor, "Color's empty hash value must not look like an ExtendedColor");
-        static_assert(emptyHashValue & (1 << 4), "Color's deleted hash value must have some bits set that an RGBA32 Color wouldn't have");
-        m_colorData.rgbaAndFlags = emptyHashValue;
+        static_assert(emptyHashValue & invalidSimpleColor, "Color's empty hash value must not look like an ExtendedColor");
+        static_assert(emptyHashValue & (1 << 4), "Color's deleted hash value must have some bits set that an SimpleColor wouldn't have");
+        m_colorData.simpleColorAndFlags = emptyHashValue;
         ASSERT(!isExtended());
     }
@@ -148 +144 @@
     String nameForRenderTreeAsText() const;
 
-    bool isValid() const { return isExtended() || (m_colorData.rgbaAndFlags & validRGBAColorBit); }
-
-    bool isOpaque() const { return isExtended() ? asExtended().alpha() == 1.0 : rgb().isOpaque(); }
-    bool isVisible() const { return isExtended() ? asExtended().alpha() > 0.0 : rgb().isVisible(); }
-
-    int alpha() const { return isExtended() ? asExtended().alpha() * 255 : rgb().alphaComponent(); }
-    float alphaAsFloat() const { return isExtended() ? asExtended().alpha() : rgb().alphaComponentAsFloat(); }
+    bool isValid() const { return isExtended() || (m_colorData.simpleColorAndFlags & validSimpleColorBit); }
+
+    bool isOpaque() const { return isExtended() ? asExtended().alpha() == 1.0 : asSimpleColor().isOpaque(); }
+    bool isVisible() const { return isExtended() ? asExtended().alpha() > 0.0 : asSimpleColor().isVisible(); }
+
+    int alpha() const { return isExtended() ? asExtended().alpha() * 255 : asSimpleColor().alphaComponent(); }
+    float alphaAsFloat() const { return isExtended() ? asExtended().alpha() : asSimpleColor().alphaComponentAsFloat(); }
 
     unsigned hash() const;
@@ -192 +188 @@
 
     // True if the color originated from a CSS semantic color name.
-    bool isSemantic() const { return !isExtended() && (m_colorData.rgbaAndFlags & isSemanticRBGAColorBit); }
+    bool isSemantic() const { return !isExtended() && (m_colorData.simpleColorAndFlags & isSemanticSimpleColorBit); }
 
 #if PLATFORM(GTK)
@@ -210 +206 @@
     WEBCORE_EXPORT operator D2D1_VECTOR_4F() const;
 #endif
-
-    static bool parseHexColor(const String&, RGBA32&);
-    static bool parseHexColor(const StringView&, RGBA32&);
-    static bool parseHexColor(const LChar*, unsigned, RGBA32&);
-    static bool parseHexColor(const UChar*, unsigned, RGBA32&);
 
     static constexpr SimpleColor black { 0xFF000000 };
@@ -225 +216 @@
     static constexpr SimpleColor yellow { 0xFFFFFF00 };
 
-#if PLATFORM(IOS_FAMILY)
-    static constexpr SimpleColor compositionFill { 0x3CAFC0E3 };
-#else
-    static constexpr SimpleColor compositionFill { 0xFFE1DD55 };
-#endif
-
     bool isExtended() const
     {
-        return !(m_colorData.rgbaAndFlags & invalidRGBAColor);
-    }
-    WEBCORE_EXPORT const ExtendedColor& asExtended() const;
+        return !(m_colorData.simpleColorAndFlags & invalidSimpleColor);
+    }
+    const ExtendedColor& asExtended() const;
 
     WEBCORE_EXPORT Color& operator=(const Color&);
@@ -253 +238 @@
 
 private:
-    RGBA32 rgb() const;
-    void setRGB(int r, int g, int b) { setRGB(makeRGB(r, g, b)); }
-    void setRGB(RGBA32);
-    void setIsSemantic() { m_colorData.rgbaAndFlags |= isSemanticRBGAColorBit; }
+    const SimpleColor asSimpleColor() const;
+
+    void setSimpleColor(SimpleColor);
+    void setIsSemantic() { m_colorData.simpleColorAndFlags |= isSemanticSimpleColorBit; }
 
     // 0x_______00 is an ExtendedColor pointer.
-    // 0x_______01 is an invalid RGBA32.
-    // 0x_______11 is a valid RGBA32.
+    // 0x_______01 is an invalid SimpleColor.
+    // 0x_______11 is a valid SimpleColor.
     static const uint64_t extendedColor = 0x0;
-    static const uint64_t invalidRGBAColor = 0x1;
-    static const uint64_t validRGBAColorBit = 0x2;
-    static const uint64_t validRGBAColor = 0x3;
-    static const uint64_t isSemanticRBGAColorBit = 0x4;
+    static const uint64_t invalidSimpleColor = 0x1;
+    static const uint64_t validSimpleColorBit = 0x2;
+    static const uint64_t validSimpleColor = 0x3;
+    static const uint64_t isSemanticSimpleColorBit = 0x4;
 
     static const uint64_t deletedHashValue = 0xFFFFFFFFFFFFFFFD;
@@ -273 +258 @@
 
     union {
-        uint64_t rgbaAndFlags { invalidRGBAColor };
+        uint64_t simpleColorAndFlags { invalidSimpleColor };
         ExtendedColor* extendedColor;
     } m_colorData;
@@ -301 +286 @@
         return extendedColorsEqual(a, b);
 
-    return a.m_colorData.rgbaAndFlags == b.m_colorData.rgbaAndFlags;
+    return a.m_colorData.simpleColorAndFlags == b.m_colorData.simpleColorAndFlags;
 }
 
@@ -313 +298 @@
     if (a.isExtended() || b.isExtended())
         return extendedColorsEqual(a, b);
-    return (a.m_colorData.rgbaAndFlags & ~Color::isSemanticRBGAColorBit) == (b.m_colorData.rgbaAndFlags & ~Color::isSemanticRBGAColorBit);
+    return (a.m_colorData.simpleColorAndFlags & ~Color::isSemanticSimpleColorBit) == (b.m_colorData.simpleColorAndFlags & ~Color::isSemanticSimpleColorBit);
 }
 
@@ -320 +305 @@
     if (isExtended())
         return asExtended().hash();
-
-    return WTF::intHash(m_colorData.rgbaAndFlags);
+    return WTF::intHash(m_colorData.simpleColorAndFlags);
 }
 
@@ -334 +318 @@
 }
 
-inline RGBA32 Color::rgb() const
-{
-    // FIXME: We should ASSERT(!isExtended()) here, or produce
-    // an RGBA32 equivalent for an ExtendedColor. Ideally the former,
-    // so we can audit all the rgb() call sites to handle extended.
-    return { static_cast<uint32_t>(m_colorData.rgbaAndFlags >> 32) };
-}
-
-inline void Color::setRGB(RGBA32 rgb)
-{
-    m_colorData.rgbaAndFlags = static_cast<uint64_t>(rgb.value()) << 32;
+inline const ExtendedColor& Color::asExtended() const
+{
+    ASSERT(isExtended());
+    return *m_colorData.extendedColor;
+}
+
+inline const SimpleColor Color::asSimpleColor() const
+{
+    // FIXME: We should ASSERT(!isExtended()) here once we have verified all
+    // call sites are checking isExtended().
+    return { static_cast<uint32_t>(m_colorData.simpleColorAndFlags >> 32) };
+}
+
+inline void Color::setSimpleColor(SimpleColor simpleColor)
+{
+    m_colorData.simpleColorAndFlags = static_cast<uint64_t>(simpleColor.value()) << 32;
     tagAsValid();
 }
@@ -355 +344 @@
     }
 
-    return color.rgb() == Color::black;
+    return color.asSimpleColor() == Color::black;
 }
 
@@ -365 +354 @@
     }
     
-    return color.rgb() == Color::white;
+    return color.asSimpleColor() == Color::white;
 }
 
@@ -390 +379 @@
     // FIXME: This should encode whether the color is semantic.
 
-    uint32_t value = rgb().value();
-
     encoder << true;
-    encoder << value;
+    encoder << asSimpleColor().value();
 }
 
@@ -419 +406 @@
         if (!decoder.decode(colorSpace))
             return WTF::nullopt;
-        return Color(red, green, blue, alpha, colorSpace);
+        return Color { red, green, blue, alpha, colorSpace };
     }
 
@@ -427 +414 @@
 
     if (!isValid)
-        return Color();
+        return Color { };
 
     uint32_t value;

trunk/Source/WebCore/platform/graphics/ColorUtilities.h

@@ -166 +166 @@
 {
     // See also colorFloatToRGBAByte().
-    return std::max(0, std::min(static_cast<int>(lroundf(255.0f * f)), 255));
+    return std::clamp(static_cast<int>(lroundf(255.0f * f)), 0, 255);
 }
 

trunk/Source/WebCore/platform/graphics/ImageBackingStore.h

@@ -161 +161 @@
 
         if (!m_premultiplyAlpha)
-            pixel = makePremultipliedRGBA(pixel.redComponent(), pixel.greenComponent(), pixel.blueComponent(), pixel.alphaComponent(), false);
+            pixel = makePremultipliedSimpleColor(pixel.redComponent(), pixel.greenComponent(), pixel.blueComponent(), pixel.alphaComponent(), false);
 
         unsigned d = 255 - a;
@@ -171 +171 @@
 
         if (m_premultiplyAlpha)
-            *dest = makeRGBA(r, g, b, a).value();
+            *dest = makeSimpleColor(r, g, b, a).value();
         else
-            *dest = makeUnPremultipliedRGBA(r, g, b, a).value();
+            *dest = makeUnpremultipliedSimpleColor(r, g, b, a).value();
     }
 
@@ -226 +226 @@
 
         if (m_premultiplyAlpha && a < 255)
-            return makePremultipliedRGBA(r, g, b, a, false).value();
-
-        return makeRGBA(r, g, b, a).value();
+            return makePremultipliedSimpleColor(r, g, b, a, false).value();
+
+        return makeSimpleColor(r, g, b, a).value();
     }
 

trunk/Source/WebCore/platform/graphics/SimpleColor.cpp

@@ -44 +44 @@
 }
 
-RGBA32 makePremultipliedRGBA(int r, int g, int b, int a, bool ceiling)
-{
-    return makeRGBA(premultipliedChannel(r, a, ceiling), premultipliedChannel(g, a, ceiling), premultipliedChannel(b, a, ceiling), a);
-}
-
-RGBA32 makePremultipliedRGBA(RGBA32 pixelColor)
+SimpleColor makePremultipliedSimpleColor(int r, int g, int b, int a, bool ceiling)
+{
+    return makeSimpleColor(premultipliedChannel(r, a, ceiling), premultipliedChannel(g, a, ceiling), premultipliedChannel(b, a, ceiling), a);
+}
+
+SimpleColor makePremultipliedSimpleColor(SimpleColor pixelColor)
 {
     if (pixelColor.isOpaque())
         return pixelColor;
-    return makePremultipliedRGBA(pixelColor.redComponent(), pixelColor.greenComponent(), pixelColor.blueComponent(), pixelColor.alphaComponent());
-}
-
-RGBA32 makeUnPremultipliedRGBA(int r, int g, int b, int a)
-{
-    return makeRGBA(unpremultipliedChannel(r, a), unpremultipliedChannel(g, a), unpremultipliedChannel(b, a), a);
-}
-
-RGBA32 makeUnPremultipliedRGBA(RGBA32 pixelColor)
+    return makePremultipliedSimpleColor(pixelColor.redComponent(), pixelColor.greenComponent(), pixelColor.blueComponent(), pixelColor.alphaComponent());
+}
+
+SimpleColor makeUnpremultipliedSimpleColor(int r, int g, int b, int a)
+{
+    return makeSimpleColor(unpremultipliedChannel(r, a), unpremultipliedChannel(g, a), unpremultipliedChannel(b, a), a);
+}
+
+SimpleColor makeUnpremultipliedSimpleColor(SimpleColor pixelColor)
 {
     if (pixelColor.isVisible() && !pixelColor.isOpaque())
-        return makeUnPremultipliedRGBA(pixelColor.redComponent(), pixelColor.greenComponent(), pixelColor.blueComponent(), pixelColor.alphaComponent());
+        return makeUnpremultipliedSimpleColor(pixelColor.redComponent(), pixelColor.greenComponent(), pixelColor.blueComponent(), pixelColor.alphaComponent());
     return pixelColor;
 }
 
-RGBA32 makeRGBA32FromFloats(float r, float g, float b, float a)
-{
-    return makeRGBA(colorFloatToRGBAByte(r), colorFloatToRGBAByte(g), colorFloatToRGBAByte(b), colorFloatToRGBAByte(a));
-}
-
-RGBA32 makeRGBAFromHSLA(float hue, float saturation, float lightness, float alpha)
+SimpleColor makeSimpleColorFromFloats(float r, float g, float b, float a)
+{
+    return makeSimpleColor(colorFloatToSimpleColorByte(r), colorFloatToSimpleColorByte(g), colorFloatToSimpleColorByte(b), colorFloatToSimpleColorByte(a));
+}
+
+SimpleColor makeSimpleColorFromHSLA(float hue, float saturation, float lightness, float alpha)
 {
     const float scaleFactor = 255.0;
     FloatComponents floatResult = hslToSRGB({ hue, saturation, lightness, alpha });
-    return makeRGBA(
+    return makeSimpleColor(
         round(floatResult.components[0] * scaleFactor),
         round(floatResult.components[1] * scaleFactor),
@@ -84 +84 @@
 }
 
-RGBA32 makeRGBAFromCMYKA(float c, float m, float y, float k, float a)
+SimpleColor makeSimpleColorFromCMYKA(float c, float m, float y, float k, float a)
 {
     double colors = 1 - k;
@@ -90 +90 @@
     int g = static_cast<int>(nextafter(256, 0) * (colors * (1 - m)));
     int b = static_cast<int>(nextafter(256, 0) * (colors * (1 - y)));
-    return makeRGBA(r, g, b, static_cast<float>(nextafter(256, 0) * a));
+    return makeSimpleColor(r, g, b, static_cast<float>(nextafter(256, 0) * a));
 }
 
@@ -136 +136 @@
 }
 
+// originally moved here from the CSS parser
+template <typename CharacterType>
+static inline Optional<SimpleColor> parseHexColorInternal(const CharacterType* name, unsigned length)
+{
+    if (length != 3 && length != 4 && length != 6 && length != 8)
+        return WTF::nullopt;
+    unsigned value = 0;
+    for (unsigned i = 0; i < length; ++i) {
+        if (!isASCIIHexDigit(name[i]))
+            return WTF::nullopt;
+        value <<= 4;
+        value |= toASCIIHexValue(name[i]);
+    }
+    if (length == 6)
+        return SimpleColor { 0xFF000000 | value };
+    if (length == 8) {
+        // We parsed the values into RGBA order, but the SimpleColor type
+        // expects them to be in ARGB order, so we right rotate eight bits.
+        return SimpleColor { value << 24 | value >> 8 };
+    }
+    if (length == 4) {
+        // #abcd converts to ddaabbcc in SimpleColor.
+        return SimpleColor {
+              (value & 0xF) << 28 | (value & 0xF) << 24
+            | (value & 0xF000) << 8 | (value & 0xF000) << 4
+            | (value & 0xF00) << 4 | (value & 0xF00)
+            | (value & 0xF0) | (value & 0xF0) >> 4
+        };
+    }
+    // #abc converts to #aabbcc
+    return SimpleColor {
+          (0xFF000000)
+        | (value & 0xF00) << 12 | (value & 0xF00) << 8
+        | (value & 0xF0) << 8 | (value & 0xF0) << 4
+        | (value & 0xF) << 4 | (value & 0xF)
+    };
+}
+
+Optional<SimpleColor> SimpleColor::parseHexColor(const LChar* name, unsigned length)
+{
+    return parseHexColorInternal(name, length);
+}
+
+Optional<SimpleColor> SimpleColor::parseHexColor(const UChar* name, unsigned length)
+{
+    return parseHexColorInternal(name, length);
+}
+
+Optional<SimpleColor> SimpleColor::parseHexColor(const String& name)
+{
+    unsigned length = name.length();
+    if (!length)
+        return WTF::nullopt;
+    if (name.is8Bit())
+        return parseHexColor(name.characters8(), name.length());
+    return parseHexColor(name.characters16(), name.length());
+}
+
+Optional<SimpleColor> SimpleColor::parseHexColor(const StringView& name)
+{
+    unsigned length = name.length();
+    if (!length)
+        return WTF::nullopt;
+    if (name.is8Bit())
+        return parseHexColor(name.characters8(), name.length());
+    return parseHexColor(name.characters16(), name.length());
+}
+
+
 } // namespace WebCore

trunk/Source/WebCore/platform/graphics/SimpleColor.h

@@ -29 +29 @@
 #include <algorithm>
 #include <cmath>
+#include <unicode/uchar.h>
 #include <wtf/Forward.h>
+#include <wtf/Optional.h>
+#include <wtf/text/LChar.h>
 
 namespace WebCore {
@@ -35 +38 @@
 // Color value with 8-bit components for red, green, blue, and alpha.
 // For historical reasons, stored as a 32-bit integer, with alpha in the high bits: ARGB.
+// FIXME: This class should be consolidated with ColorComponents.
 class SimpleColor {
 public:
@@ -71 +75 @@
     }
 
+    static Optional<SimpleColor> parseHexColor(const String&);
+    static Optional<SimpleColor> parseHexColor(const StringView&);
+    static Optional<SimpleColor> parseHexColor(const LChar*, unsigned);
+    static Optional<SimpleColor> parseHexColor(const UChar*, unsigned);
+
 private:
     uint32_t m_value { 0 };
@@ -78 +87 @@
 bool operator!=(SimpleColor, SimpleColor);
 
-// FIXME: Remove this after migrating to the new name.
-using RGBA32 = SimpleColor;
+constexpr SimpleColor makeSimpleColor(int r, int g, int b);
+constexpr SimpleColor makeSimpleColor(int r, int g, int b, int a);
 
-constexpr RGBA32 makeRGB(int r, int g, int b);
-constexpr RGBA32 makeRGBA(int r, int g, int b, int a);
+SimpleColor makePremultipliedSimpleColor(int r, int g, int b, int a, bool ceiling = true);
+SimpleColor makePremultipliedSimpleColor(SimpleColor);
+SimpleColor makeUnpremultipliedSimpleColor(int r, int g, int b, int a);
+SimpleColor makeUnpremultipliedSimpleColor(SimpleColor);
 
-RGBA32 makePremultipliedRGBA(int r, int g, int b, int a, bool ceiling = true);
-RGBA32 makePremultipliedRGBA(RGBA32);
-RGBA32 makeUnPremultipliedRGBA(int r, int g, int b, int a);
-RGBA32 makeUnPremultipliedRGBA(RGBA32);
-
-WEBCORE_EXPORT RGBA32 makeRGBA32FromFloats(float r, float g, float b, float a);
-WEBCORE_EXPORT RGBA32 makeRGBAFromHSLA(float h, float s, float l, float a);
-RGBA32 makeRGBAFromCMYKA(float c, float m, float y, float k, float a);
+WEBCORE_EXPORT SimpleColor makeSimpleColorFromFloats(float r, float g, float b, float a);
+WEBCORE_EXPORT SimpleColor makeSimpleColorFromHSLA(float h, float s, float l, float a);
+SimpleColor makeSimpleColorFromCMYKA(float c, float m, float y, float k, float a);
 
 uint8_t roundAndClampColorChannel(int);
@@ -99 +105 @@
 uint16_t fastDivideBy255(uint16_t);
 
-uint8_t colorFloatToRGBAByte(float);
+uint8_t colorFloatToSimpleColorByte(float);
 
 inline bool operator==(SimpleColor a, SimpleColor b)
@@ -113 +119 @@
 inline uint8_t roundAndClampColorChannel(int value)
 {
-    return std::max(0, std::min(255, value));
+    return std::clamp(value, 0, 255);
 }
 
 inline uint8_t roundAndClampColorChannel(float value)
 {
-    return std::max(0.f, std::min(255.f, std::round(value)));
+    return std::clamp(std::round(value), 0.f, 255.f);
 }
 
@@ -135 +141 @@
 }
 
-inline uint8_t colorFloatToRGBAByte(float f)
+inline uint8_t colorFloatToSimpleColorByte(float f)
 {
     // FIXME: Consolidate with clampedColorComponent().
     // We use lroundf and 255 instead of nextafterf(256, 0) to match CG's rounding
-    return std::max(0, std::min(static_cast<int>(lroundf(255.0f * f)), 255));
+    return std::clamp(static_cast<int>(lroundf(255.0f * f)), 0, 255);
 }
 
-constexpr RGBA32 makeRGB(int r, int g, int b)
+constexpr SimpleColor makeSimpleColor(int r, int g, int b)
 {
-    return makeRGBA(r, g, b, 0xFF);
+    return makeSimpleColor(r, g, b, 0xFF);
 }
 
-constexpr RGBA32 makeRGBA(int r, int g, int b, int a)
+constexpr SimpleColor makeSimpleColor(int r, int g, int b, int a)
 {
-    return { static_cast<unsigned>(std::max(0, std::min(a, 0xFF)) << 24 | std::max(0, std::min(r, 0xFF)) << 16 | std::max(0, std::min(g, 0xFF)) << 8 | std::max(0, std::min(b, 0xFF))) };
+    return { static_cast<unsigned>(std::clamp(a, 0, 0xFF) << 24 | std::clamp(r, 0, 0xFF) << 16 | std::clamp(g, 0, 0xFF) << 8 | std::clamp(b, 0, 0xFF)) };
 }
 

trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp

@@ -65 +65 @@
 }
 
-static Optional<SimpleColor> makeRGBA32FromARGBCFArray(CFArrayRef colorArray)
+static Optional<SimpleColor> makeSimpleColorFromARGBCFArray(CFArrayRef colorArray)
 {
     if (CFArrayGetCount(colorArray) < 4)
@@ -81 +81 @@
     }
 
-    return makeRGBA32FromFloats(componentArray[1], componentArray[2], componentArray[3], componentArray[0]);
+    return makeSimpleColorFromFloats(componentArray[1], componentArray[2], componentArray[3], componentArray[0]);
 }
 
@@ -268 +268 @@
                     continue;
                 
-                auto color = makeRGBA32FromARGBCFArray(arrayValue);
+                auto color = makeSimpleColorFromARGBCFArray(arrayValue);
                 if (!color)
                     continue;
@@ -280 +280 @@
                     continue;
                 
-                auto color = makeRGBA32FromARGBCFArray(arrayValue);
+                auto color = makeSimpleColorFromARGBCFArray(arrayValue);
                 if (!color)
                     continue;
@@ -292 +292 @@
                     continue;
                 
-                auto color = makeRGBA32FromARGBCFArray(arrayValue);
+                auto color = makeSimpleColorFromARGBCFArray(arrayValue);
                 if (!color)
                     continue;

trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairoImageSurfaceBackend.cpp

@@ -81 +81 @@
         for (int x = 0; x < m_logicalSize.width(); x++) {
             unsigned* pixel = row + x;
-            auto pixelColor = makeUnPremultipliedRGBA(*pixel);
-            pixelColor = makeRGBA(lookUpTable[pixelColor.redComponent()], lookUpTable[pixelColor.greenComponent()], lookUpTable[pixelColor.blueComponent()], pixelColor.alphaComponent());
-            *pixel = makePremultipliedRGBA(pixelColor).value();
+            auto pixelColor = makeUnpremultipliedSimpleColor(*pixel);
+            pixelColor = makeSimpleColor(lookUpTable[pixelColor.redComponent()], lookUpTable[pixelColor.greenComponent()], lookUpTable[pixelColor.blueComponent()], pixelColor.alphaComponent());
+            *pixel = makePremultipliedSimpleColor(pixelColor).value();
         }
     }

trunk/Source/WebCore/platform/graphics/cairo/NativeImageCairo.cpp

@@ -54 +54 @@
         return Color();
 
-    RGBA32* pixel = reinterpret_cast_ptr<RGBA32*>(cairo_image_surface_get_data(image.get()));
-    return makeUnPremultipliedRGBA(*pixel);
+    SimpleColor* pixel = reinterpret_cast_ptr<SimpleColor*>(cairo_image_surface_get_data(image.get()));
+    return makeUnpremultipliedSimpleColor(*pixel);
 }
 

trunk/Source/WebCore/platform/graphics/cg/ColorCG.cpp

@@ -52 +52 @@
 namespace WebCore {
 
-static RGBA32 makeRGBAFromCGColor(CGColorRef color)
+static SimpleColor makeSimpleColorFromCGColor(CGColorRef color)
 {
+    // FIXME: ExtendedColor - needs to handle color spaces.
+
     size_t numComponents = CGColorGetNumberOfComponents(color);
     const CGFloat* components = CGColorGetComponents(color);
@@ -78 +80 @@
 
     static const double scaleFactor = nextafter(256.0, 0.0);
-    return makeRGBA(r * scaleFactor, g * scaleFactor, b * scaleFactor, a * scaleFactor);
+    return makeSimpleColor(r * scaleFactor, g * scaleFactor, b * scaleFactor, a * scaleFactor);
 }
 
 Color::Color(CGColorRef color)
 {
+    // FIXME: ExtendedColor - needs to handle color spaces.
+
     if (!color) {
-        m_colorData.rgbaAndFlags = invalidRGBAColor;
+        m_colorData.simpleColorAndFlags = invalidSimpleColor;
         return;
     }
 
-    setRGB(makeRGBAFromCGColor(color));
+    setSimpleColor(makeSimpleColorFromCGColor(color));
 }
 
 Color::Color(CGColorRef color, SemanticTag)
 {
+    // FIXME: ExtendedColor - needs to handle color spaces.
+
     if (!color) {
-        m_colorData.rgbaAndFlags = invalidRGBAColor;
+        m_colorData.simpleColorAndFlags = invalidSimpleColor;
         return;
     }
 
-    setRGB(makeRGBAFromCGColor(color));
+    setSimpleColor(makeSimpleColorFromCGColor(color));
     setIsSemantic();
 }
@@ -125 +131 @@
 {
     if (!color.isExtended()) {
-        switch (color.rgb().value()) {
+        switch (color.asSimpleColor().value()) {
         case Color::transparent.value(): {
             static CGColorRef transparentCGColor = leakCGColor(color);
@@ -141 +147 @@
     }
 
-    ASSERT(color.isExtended() || color.rgb().value());
+    ASSERT(color.isExtended() || color.asSimpleColor().value());
 
     static NeverDestroyed<TinyLRUCache<Color, RetainPtr<CGColorRef>, 32>> cache;

trunk/Source/WebCore/platform/graphics/gtk/ColorGtk.cpp

@@ -29 +29 @@
 Color::Color(const GdkRGBA& c)
 {
-    setRGB(makeRGBA(static_cast<int>(c.red * 255),
+    setSimpleColor(makeSimpleColor(
+        static_cast<int>(c.red * 255),
         static_cast<int>(c.green * 255),
         static_cast<int>(c.blue * 255),
-        static_cast<int>(c.alpha * 255)));
+        static_cast<int>(c.alpha * 255)
+    ));
 }
 

trunk/Source/WebCore/platform/graphics/mac/ColorMac.mm

@@ -54 +54 @@
 }
 
-static RGBA32 makeRGBAFromNSColor(NSColor *color)
+static SimpleColor makeSimpleColorFromNSColor(NSColor *color)
 {
+    // FIXME: ExtendedColor - needs to handle color spaces.
+
     ASSERT_ARG(color, color);
 
@@ -81 +83 @@
         [offscreenRep getPixel:pixel atX:0 y:0];
 
-        return makeRGBA(pixel[0], pixel[1], pixel[2], pixel[3]);
+        return makeSimpleColor(pixel[0], pixel[1], pixel[2], pixel[3]);
     }
 
@@ -88 +90 @@
 
     static const double scaleFactor = nextafter(256.0, 0.0);
-    return makeRGBA(scaleFactor * redComponent, scaleFactor * greenComponent, scaleFactor * blueComponent, scaleFactor * alpha);
+    return makeSimpleColor(scaleFactor * redComponent, scaleFactor * greenComponent, scaleFactor * blueComponent, scaleFactor * alpha);
 }
 
 Color colorFromNSColor(NSColor *color)
 {
-    return Color(makeRGBAFromNSColor(color));
+    // FIXME: ExtendedColor - needs to handle color spaces.
+
+    return Color(makeSimpleColorFromNSColor(color));
 }
 
 Color semanticColorFromNSColor(NSColor *color)
 {
-    return Color(makeRGBAFromNSColor(color), Color::Semantic);
+    // FIXME: ExtendedColor - needs to handle color spaces.
+
+    return Color(makeSimpleColorFromNSColor(color), Color::Semantic);
 }
 

trunk/Source/WebCore/platform/graphics/win/ColorDirect2D.cpp

@@ -37 +37 @@
 Color::Color(D2D1_COLOR_F color)
 {
-    setRGB(makeRGBA(color.r * 255, color.g * 255, color.b * 255, color.a * 255));
+    setSimpleColor(makeSimpleColor(color.r * 255, color.g * 255, color.b * 255, color.a * 255));
 }
 

trunk/Source/WebCore/platform/graphics/win/GraphicsContextCGWin.cpp

@@ -199 +199 @@
     CGContextSaveGState(context);
 
-    static constexpr SimpleColor spellingPatternColor { makeRGB(255, 0, 0) };
-    static constexpr SimpleColor grammarPatternColor { makeRGB(0, 128, 0) };
+    static constexpr SimpleColor spellingPatternColor { makeSimpleColor(255, 0, 0) };
+    static constexpr SimpleColor grammarPatternColor { makeSimpleColor(0, 128, 0) };
 
     const SimpleColor& patternColor = style.mode == DocumentMarkerLineStyle::Mode::Grammar ? grammarPatternColor : spellingPatternColor;

trunk/Source/WebCore/platform/graphics/win/PlatformContextDirect2D.cpp

@@ -133 +133 @@
 COMPtr<ID2D1SolidColorBrush> PlatformContextDirect2D::brushWithColor(const D2D1_COLOR_F& color)
 {
-    RGBA32 colorKey = makeRGBA32FromFloats(color.r, color.g, color.b, color.a);
+    SimpleColor colorKey = makeSimpleColorFromFloats(color.r, color.g, color.b, color.a);
 
     if (!colorKey) {

trunk/Source/WebCore/platform/ios/ColorIOS.mm

@@ -35 +35 @@
 Color colorFromUIColor(UIColor *color)
 {
+    // FIXME: ExtendedColor - needs to handle color spaces.
+
     // FIXME: Make this work for a UIColor that was created from a pattern or a DispayP3 color.
     CGFloat redComponent;
@@ -44 +46 @@
 
     static const double scaleFactor = nextafter(256.0, 0.0);
-    return makeRGBA(scaleFactor * redComponent, scaleFactor * greenComponent, scaleFactor * blueComponent, scaleFactor * alpha);
+    return makeSimpleColor(scaleFactor * redComponent, scaleFactor * greenComponent, scaleFactor * blueComponent, scaleFactor * alpha);
 }
 

trunk/Source/WebCore/rendering/InlineTextBox.cpp

@@ -1249 +1249 @@
 {
     if (!renderer().frame().editor().compositionUsesCustomHighlights()) {
-        paintMarkedTextBackground(paintInfo, boxOrigin, Color::compositionFill, clampedOffset(renderer().frame().editor().compositionStart()), clampedOffset(renderer().frame().editor().compositionEnd()));
+        paintMarkedTextBackground(paintInfo, boxOrigin, CompositionHighlight::defaultCompositionFillColor, clampedOffset(renderer().frame().editor().compositionStart()), clampedOffset(renderer().frame().editor().compositionEnd()));
         return;
     }

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -4080 +4080 @@
         LayoutRect largerCorner = resizerAbsRect;
         largerCorner.setSize(LayoutSize(largerCorner.width() + 1_lu, largerCorner.height() + 1_lu));
-        context.setStrokeColor(Color(makeRGB(217, 217, 217)));
+        context.setStrokeColor(makeSimpleColor(217, 217, 217));
         context.setStrokeThickness(1.0f);
         context.setFillColor(Color::transparent);

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -3086 +3086 @@
     ASCIILiteral name;
     FloatSize phase;
-    RGBA32 fillColor;
+    SimpleColor fillColor;
 };
 
@@ -3146 +3146 @@
     };
 
-    constexpr auto fillColor = makeRGBA(0, 0, 0, 128);
+    constexpr auto fillColor = makeSimpleColor(0, 0, 0, 128);
 
     static const PatternDescription patternDescriptions[] = {
@@ -3166 +3166 @@
 static RefPtr<Pattern> patternForEventListenerRegionType(EventListenerRegionType type, FloatSize contentOffset, GraphicsContext& destContext)
 {
-    constexpr auto fillColor = makeRGBA(0, 128, 0, 128);
+    constexpr auto fillColor = makeSimpleColor(0, 128, 0, 128);
 
     auto patternAndPhase = [&]() -> PatternDescription {

trunk/Source/WebCore/rendering/RenderThemeAdwaita.cpp

@@ -46 +46 @@
 
 static const int textFieldBorderSize = 1;
-static const Color textFieldBorderColor = makeRGB(205, 199, 194);
-static const Color textFieldBorderDisabledColor = makeRGB(213, 208, 204);
-static const Color textFieldBackgroundColor = makeRGB(255, 255, 255);
-static const Color textFieldBackgroundDisabledColor = makeRGB(252, 252, 252);
+static const Color textFieldBorderColor = makeSimpleColor(205, 199, 194);
+static const Color textFieldBorderDisabledColor = makeSimpleColor(213, 208, 204);
+static const Color textFieldBackgroundColor = makeSimpleColor(255, 255, 255);
+static const Color textFieldBackgroundDisabledColor = makeSimpleColor(252, 252, 252);
 static const unsigned menuListButtonArrowSize = 16;
 static const int menuListButtonFocusOffset = -3;
@@ -58 +58 @@
 static const Seconds progressAnimationFrameRate = 33_ms; // 30fps.
 static const unsigned progressBarSize = 6;
-static const Color progressBarBorderColor = makeRGB(205, 199, 194);
-static const Color progressBarBackgroundColor = makeRGB(225, 222, 219);
+static const Color progressBarBorderColor = makeSimpleColor(205, 199, 194);
+static const Color progressBarBackgroundColor = makeSimpleColor(225, 222, 219);
 static const unsigned sliderTrackSize = 6;
 static const int sliderTrackBorderSize = 1;
-static const Color sliderTrackBorderColor = makeRGB(205, 199, 194);
-static const Color sliderTrackBackgroundColor = makeRGB(225, 222, 219);
+static const Color sliderTrackBorderColor = makeSimpleColor(205, 199, 194);
+static const Color sliderTrackBackgroundColor = makeSimpleColor(225, 222, 219);
 static const int sliderTrackFocusOffset = 2;
 static const int sliderThumbSize = 20;
 static const int sliderThumbBorderSize = 1;
-static const Color sliderThumbBorderColor = makeRGB(205, 199, 194);
-static const Color sliderThumbBackgroundColor = makeRGB(244, 242, 241);
-static const Color sliderThumbBackgroundHoveredColor = makeRGB(248, 248, 247);
-static const Color sliderThumbBackgroundDisabledColor = makeRGB(244, 242, 241);
+static const Color sliderThumbBorderColor = makeSimpleColor(205, 199, 194);
+static const Color sliderThumbBackgroundColor = makeSimpleColor(244, 242, 241);
+static const Color sliderThumbBackgroundHoveredColor = makeSimpleColor(248, 248, 247);
+static const Color sliderThumbBackgroundDisabledColor = makeSimpleColor(244, 242, 241);
 #if ENABLE(VIDEO)
-static const Color mediaSliderTrackBackgroundcolor = makeRGB(77, 77, 77);
-static const Color mediaSliderTrackBufferedColor = makeRGB(173, 173, 173);
-static const Color mediaSliderTrackActiveColor = makeRGB(252, 252, 252);
+static const Color mediaSliderTrackBackgroundcolor = makeSimpleColor(77, 77, 77);
+static const Color mediaSliderTrackBufferedColor = makeSimpleColor(173, 173, 173);
+static const Color mediaSliderTrackActiveColor = makeSimpleColor(252, 252, 252);
 #endif
 

trunk/Source/WebCore/rendering/RenderThemeMac.mm

@@ -552 +552 @@
 }
 
-static RGBA32 menuBackgroundColor()
+static SimpleColor menuBackgroundColor()
 {
     RetainPtr<NSBitmapImageRep> offscreenRep = adoptNS([[NSBitmapImageRep alloc] initWithBitmapDataPlanes:nil pixelsWide:1 pixelsHigh:1
@@ -569 +569 @@
     [offscreenRep getPixel:pixel atX:0 y:0];
 
-    return makeRGBA(pixel[0], pixel[1], pixel[2], pixel[3]);
+    return makeSimpleColor(pixel[0], pixel[1], pixel[2], pixel[3]);
 }
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-05-24  Sam Weinig  <weinig@apple.com>
+
+        Extended Color Cleanup: Use the name SimpleColor consistently
+        https://bugs.webkit.org/show_bug.cgi?id=212337
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (compositionHighlights):
+        Update for new name of CompositionHighlight::defaultCompositionFillColor.
+
 2020-05-24  Rob Buis  <rbuis@igalia.com>
 

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -4625 +4625 @@
             return;
 
-        WebCore::Color highlightColor { WebCore::Color::compositionFill };
+        WebCore::Color highlightColor { WebCore::CompositionHighlight::defaultCompositionFillColor };
         if (UIColor *uiColor = attributes[NSBackgroundColorAttributeName])
             highlightColor = WebCore::colorFromUIColor(uiColor);

trunk/Tools/ChangeLog

@@ +1 @@
+2020-05-24  Sam Weinig  <weinig@apple.com>
+
+        Extended Color Cleanup: Use the name SimpleColor consistently
+        https://bugs.webkit.org/show_bug.cgi?id=212337
+
+        Reviewed by Anders Carlsson.
+
+        * TestWebKitAPI/Tests/WebCore/ColorTests.cpp:
+        (TestWebKitAPI::TEST):
+        Update test for rename of makeRGBAFromHSLA to makeSimpleColorFromHSLA.
+
 2020-05-25  Víctor Manuel Jáquez Leal  <vjaquez@igalia.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebCore/ColorTests.cpp

@@ -46 +46 @@
     EXPECT_FLOAT_EQ(color.lightness(), lightness);
     
-    auto roundTrippedColor = Color(makeRGBAFromHSLA(hue, saturation, lightness, alpha));
+    auto roundTrippedColor = Color(makeSimpleColorFromHSLA(hue, saturation, lightness, alpha));
     EXPECT_EQ(color, roundTrippedColor);
 }
@@ -62 +62 @@
     EXPECT_FLOAT_EQ(color.lightness(), lightness);
 
-    auto roundTrippedColor = Color(makeRGBAFromHSLA(hue, saturation, lightness, alpha));
+    auto roundTrippedColor = Color(makeSimpleColorFromHSLA(hue, saturation, lightness, alpha));
     EXPECT_EQ(color, roundTrippedColor);
 }
@@ -78 +78 @@
     EXPECT_FLOAT_EQ(color.lightness(), lightness);
 
-    auto roundTrippedColor = Color(makeRGBAFromHSLA(hue, saturation, lightness, alpha));
+    auto roundTrippedColor = Color(makeSimpleColorFromHSLA(hue, saturation, lightness, alpha));
     EXPECT_EQ(color, roundTrippedColor);
 }
@@ -94 +94 @@
     EXPECT_FLOAT_EQ(color.lightness(), lightness);
 
-    auto roundTrippedColor = Color(makeRGBAFromHSLA(hue, saturation, lightness, alpha));
+    auto roundTrippedColor = Color(makeSimpleColorFromHSLA(hue, saturation, lightness, alpha));
     EXPECT_EQ(color, roundTrippedColor);
 }
@@ -110 +110 @@
     EXPECT_FLOAT_EQ(color.lightness(), lightness);
 
-    auto roundTrippedColor = Color(makeRGBAFromHSLA(hue, saturation, lightness, alpha));
+    auto roundTrippedColor = Color(makeSimpleColorFromHSLA(hue, saturation, lightness, alpha));
     EXPECT_EQ(color, roundTrippedColor);
 }
@@ -126 +126 @@
     EXPECT_FLOAT_EQ(color.lightness(), lightness);
 
-    auto roundTrippedColor = Color(makeRGBAFromHSLA(hue, saturation, lightness, alpha));
+    auto roundTrippedColor = Color(makeSimpleColorFromHSLA(hue, saturation, lightness, alpha));
     EXPECT_EQ(color, roundTrippedColor);
 }
@@ -142 +142 @@
     EXPECT_FLOAT_EQ(color.lightness(), lightness);
 
-    auto roundTrippedColor = Color(makeRGBAFromHSLA(hue, saturation, lightness, alpha));
+    auto roundTrippedColor = Color(makeSimpleColorFromHSLA(hue, saturation, lightness, alpha));
     EXPECT_EQ(color, roundTrippedColor);
 }
@@ -158 +158 @@
     EXPECT_FLOAT_EQ(color.lightness(), lightness);
 
-    auto roundTrippedColor = Color(makeRGBAFromHSLA(hue, saturation, lightness, alpha));
+    auto roundTrippedColor = Color(makeSimpleColorFromHSLA(hue, saturation, lightness, alpha));
     EXPECT_EQ(color, roundTrippedColor);
 }