Changeset 281237 in webkit

Timestamp:

Aug 19, 2021, 8:46:32 AM (5 years ago)

Author:

Simon Fraser

Message:

Use an enum for the forVisitedLink argument to BuilderState::colorFromPrimitiveValue()
​https://bugs.webkit.org/show_bug.cgi?id=229224

Reviewed by Alex Christensen.

Convert the bool argument to an enum class.

• css/makeprop.pl:

(colorFromPrimitiveValue):

• style/StyleBuilderCustom.h:

(WebCore::Style::BuilderCustom::applyValueCaretColor):
(WebCore::Style::BuilderCustom::applyValueStrokeColor):

• style/StyleBuilderState.cpp:

(WebCore::Style::BuilderState::colorFromPrimitiveValue const):

• style/StyleBuilderState.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/makeprop.pl (modified) (1 diff)
• style/StyleBuilderCustom.h (modified) (3 diffs)
• style/StyleBuilderState.cpp (modified) (2 diffs)
• style/StyleBuilderState.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-08-19  Simon Fraser  <simon.fraser@apple.com>
+
+        Use an enum for the forVisitedLink argument to BuilderState::colorFromPrimitiveValue()
+        https://bugs.webkit.org/show_bug.cgi?id=229224
+
+        Reviewed by Alex Christensen.
+
+        Convert the bool argument to an enum class.
+
+        * css/makeprop.pl:
+        (colorFromPrimitiveValue):
+        * style/StyleBuilderCustom.h:
+        (WebCore::Style::BuilderCustom::applyValueCaretColor):
+        (WebCore::Style::BuilderCustom::applyValueStrokeColor):
+        * style/StyleBuilderState.cpp:
+        (WebCore::Style::BuilderState::colorFromPrimitiveValue const):
+        * style/StyleBuilderState.h:
+
 2021-08-19  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/css/makeprop.pl

@@ -1014 +1014 @@
   my $forVisitedLink = @_ ? shift : NOT_FOR_VISITED_LINK;
 
-  return "builderState.colorFromPrimitiveValue(" . $primitiveValue . ", /* forVisitedLink */ " . ($forVisitedLink ? "true" : "false") . ")";
+  return "builderState.colorFromPrimitiveValue(" . $primitiveValue . ", ForVisitedLink::" . ($forVisitedLink ? "Yes" : "No") . ")";
 }
 

trunk/Source/WebCore/style/StyleBuilderCustom.h

@@ -826 +826 @@
             builderState.style().setHasAutoCaretColor();
         else
-            builderState.style().setCaretColor(builderState.colorFromPrimitiveValue(primitiveValue, /* forVisitedLink */ false));
+            builderState.style().setCaretColor(builderState.colorFromPrimitiveValue(primitiveValue, ForVisitedLink::No));
     }
     if (builderState.applyPropertyToVisitedLinkStyle()) {
@@ -832 +832 @@
             builderState.style().setHasVisitedLinkAutoCaretColor();
         else
-            builderState.style().setVisitedLinkCaretColor(builderState.colorFromPrimitiveValue(primitiveValue, /* forVisitedLink */ true));
+            builderState.style().setVisitedLinkCaretColor(builderState.colorFromPrimitiveValue(primitiveValue, ForVisitedLink::Yes));
     }
 }
@@ -2025 +2025 @@
     auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
     if (builderState.applyPropertyToRegularStyle())
-        builderState.style().setStrokeColor(builderState.colorFromPrimitiveValue(primitiveValue, /* forVisitedLink */ false));
+        builderState.style().setStrokeColor(builderState.colorFromPrimitiveValue(primitiveValue, ForVisitedLink::No));
     if (builderState.applyPropertyToVisitedLinkStyle())
-        builderState.style().setVisitedLinkStrokeColor(builderState.colorFromPrimitiveValue(primitiveValue, /* forVisitedLink */ true));
+        builderState.style().setVisitedLinkStrokeColor(builderState.colorFromPrimitiveValue(primitiveValue, ForVisitedLink::Yes));
     builderState.style().setHasExplicitlySetStrokeColor(true);
 }

trunk/Source/WebCore/style/StyleBuilderState.cpp

@@ -291 +291 @@
 }
 
-Color BuilderState::colorFromPrimitiveValue(const CSSPrimitiveValue& value, bool forVisitedLink) const
+Color BuilderState::colorFromPrimitiveValue(const CSSPrimitiveValue& value, ForVisitedLink forVisitedLink) const
 {
     if (value.isRGBColor())
@@ -301 +301 @@
         return document().textColor();
     case CSSValueWebkitLink:
-        return (element() && element()->isLink() && forVisitedLink) ? document().visitedLinkColor() : document().linkColor();
+        return (element() && element()->isLink() && forVisitedLink == ForVisitedLink::Yes) ? document().visitedLinkColor() : document().linkColor();
     case CSSValueWebkitActivelink:
         return document().activeLinkColor();

trunk/Source/WebCore/style/StyleBuilderState.h

@@ -44 +44 @@
 
 void maybeUpdateFontForLetterSpacing(BuilderState&, CSSValue&);
+
+enum class ForVisitedLink : bool {
+    No,
+    Yes
+};
 
 struct BuilderContext {
@@ -91 +96 @@
 
     static bool isColorFromPrimitiveValueDerivedFromElement(const CSSPrimitiveValue&);
-    Color colorFromPrimitiveValue(const CSSPrimitiveValue&, bool forVisitedLink = false) const;
+    Color colorFromPrimitiveValue(const CSSPrimitiveValue&, ForVisitedLink = ForVisitedLink::No) const;
     // FIXME: Remove. 'currentcolor' should be resolved at use time. All call sites are broken with inheritance.
     Color colorFromPrimitiveValueWithResolvedCurrentColor(const CSSPrimitiveValue&) const;