Changeset 263713 in webkit

Timestamp:

Jun 29, 2020 6:32:01 PM (4 years ago)

Author:

weinig@apple.com

Message:

Simplify Color's interface by removing isDark()
​https://bugs.webkit.org/show_bug.cgi?id=213707

Reviewed by Darin Adler.

• Move Color::isDark to RenderThemeIOS.mm, its one client and rename it to useConvexGradient() to indicate what it is actually determining.

• platform/graphics/Color.cpp:

(WebCore::Color::isDark const): Deleted.

• platform/graphics/Color.h:
• rendering/RenderThemeIOS.mm:

(WebCore::useConvexGradient):
(WebCore::RenderThemeIOS::paintPushButtonDecorations):
(WebCore::RenderThemeIOS::paintFileUploadIconDecorations):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/Color.cpp (modified) (1 diff)
• platform/graphics/Color.h (modified) (1 diff)
• rendering/RenderThemeIOS.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-06-29  Sam Weinig  <weinig@apple.com>
+
+        Simplify Color's interface by removing isDark()
+        https://bugs.webkit.org/show_bug.cgi?id=213707
+
+        Reviewed by Darin Adler.
+
+        - Move Color::isDark to RenderThemeIOS.mm, its one client and rename it
+          to useConvexGradient() to indicate what it is actually determining.
+
+        * platform/graphics/Color.cpp:
+        (WebCore::Color::isDark const): Deleted.
+        * platform/graphics/Color.h:
+        * rendering/RenderThemeIOS.mm:
+        (WebCore::useConvexGradient):
+        (WebCore::RenderThemeIOS::paintPushButtonDecorations):
+        (WebCore::RenderThemeIOS::paintFileUploadIconDecorations):
+
 2020-06-29  Peng Liu  <peng.liu6@apple.com>
 

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

@@ -132 +132 @@
 }
 
-bool Color::isDark() const
-{
-    // FIXME: This should probably be using luminance.
-    auto [r, g, b, a] = toSRGBALossy();
-    float largestNonAlphaChannel = std::max({ r, g, b });
-    return a > 0.5 && largestNonAlphaChannel < 0.5;
-}
-
 float Color::lightness() const
 {

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

@@ -142 +142 @@
 
     // FIXME: Replace remaining uses with luminance.
-    WEBCORE_EXPORT bool isDark() const;
     WEBCORE_EXPORT float lightness() const;
 

trunk/Source/WebCore/rendering/RenderThemeIOS.mm

@@ -1053 +1053 @@
 }
 
+static bool shouldUseConvexGradient(const Color& backgroundColor)
+{
+    // FIXME: This should probably be using luminance.
+    auto [r, g, b, a] = backgroundColor.toSRGBALossy();
+    float largestNonAlphaChannel = std::max({ r, g, b });
+    return a > 0.5 && largestNonAlphaChannel < 0.5;
+}
+
 bool RenderThemeIOS::paintPushButtonDecorations(const RenderObject& box, const PaintInfo& paintInfo, const IntRect& rect)
 {
@@ -1059 +1067 @@
 
     CGContextRef cgContext = paintInfo.context().platformContext();
-    if (box.style().visitedDependentColor(CSSPropertyBackgroundColor).isDark())
+    if (shouldUseConvexGradient(box.style().visitedDependentColor(CSSPropertyBackgroundColor)))
         drawAxialGradient(cgContext, gradientWithName(ConvexGradient), clip.location(), FloatPoint(clip.x(), clip.maxY()), LinearInterpolation);
     else {
@@ -1108 +1116 @@
             CGContextRef cgContext = paintInfo.context().platformContext();
             paintInfo.context().clip(thumbnailRect);
-            if (backgroundImageColor.isDark())
+            if (shouldUseConvexGradient(backgroundImageColor))
                 drawAxialGradient(cgContext, gradientWithName(ConvexGradient), thumbnailRect.location(), FloatPoint(thumbnailRect.x(), thumbnailRect.maxY()), LinearInterpolation);
             else {