1 files changed, 17 insertions, 38 deletions
diff --git a/chromium/third_party/blink/renderer/core/css/properties/computed_style_utils.cc b/chromium/third_party/blink/renderer/core/css/properties/computed_style_utils.cc
index 566b70cc563..73b8a08f7a3 100644
--- a/chromium/third_party/blink/renderer/core/css/properties/computed_style_utils.cc
+++ b/chromium/third_party/blink/renderer/core/css/properties/computed_style_utils.cc
@@ -709,17 +709,17 @@ CSSValue* ComputedStyleUtils::ValueForLineHeight(const ComputedStyle& style) {
 }
 
 CSSValueID IdentifierForFamily(const AtomicString& family) {
-  if (family == FontFamilyNames::webkit_cursive)
+  if (family == font_family_names::kWebkitCursive)
     return CSSValueCursive;
-  if (family == FontFamilyNames::webkit_fantasy)
+  if (family == font_family_names::kWebkitFantasy)
     return CSSValueFantasy;
-  if (family == FontFamilyNames::webkit_monospace)
+  if (family == font_family_names::kWebkitMonospace)
     return CSSValueMonospace;
-  if (family == FontFamilyNames::webkit_pictograph)
+  if (family == font_family_names::kWebkitPictograph)
     return CSSValueWebkitPictograph;
-  if (family == FontFamilyNames::webkit_sans_serif)
+  if (family == font_family_names::kWebkitSansSerif)
     return CSSValueSansSerif;
-  if (family == FontFamilyNames::webkit_serif)
+  if (family == font_family_names::kWebkitSerif)
     return CSSValueSerif;
   return CSSValueInvalid;
 }
@@ -1856,27 +1856,6 @@ CSSValue* ComputedStyleUtils::StrokeDashArrayToCSSValueList(
   return list;
 }
 
-CSSValue* ComputedStyleUtils::PaintOrderToCSSValueList(
-    const SVGComputedStyle& svg_style) {
-  CSSValueList* list = CSSValueList::CreateSpaceSeparated();
-  for (int i = 0; i < 3; i++) {
-    EPaintOrderType paint_order_type = svg_style.PaintOrderType(i);
-    switch (paint_order_type) {
-      case PT_FILL:
-      case PT_STROKE:
-      case PT_MARKERS:
-        list->Append(*CSSIdentifierValue::Create(paint_order_type));
-        break;
-      case PT_NONE:
-      default:
-        NOTREACHED();
-        break;
-    }
-  }
-
-  return list;
-}
-
 CSSValue* ComputedStyleUtils::AdjustSVGPaintForCurrentColor(
     const SVGPaint& paint,
     const Color& current_color) {
@@ -2309,30 +2288,30 @@ CSSValue* ComputedStyleUtils::ValuesForFontVariantProperty(
 // Returns up to two values for 'scroll-customization' property. The values
 // correspond to the customization values for 'x' and 'y' axes.
 CSSValue* ComputedStyleUtils::ScrollCustomizationFlagsToCSSValue(
-    ScrollCustomization::ScrollDirection scroll_customization) {
+    scroll_customization::ScrollDirection scroll_customization) {
   CSSValueList* list = CSSValueList::CreateSpaceSeparated();
-  if (scroll_customization == ScrollCustomization::kScrollDirectionAuto) {
+  if (scroll_customization == scroll_customization::kScrollDirectionAuto) {
     list->Append(*CSSIdentifierValue::Create(CSSValueAuto));
   } else if (scroll_customization ==
-             ScrollCustomization::kScrollDirectionNone) {
+             scroll_customization::kScrollDirectionNone) {
     list->Append(*CSSIdentifierValue::Create(CSSValueNone));
   } else {
-    if ((scroll_customization & ScrollCustomization::kScrollDirectionPanX) ==
-        ScrollCustomization::kScrollDirectionPanX)
+    if ((scroll_customization & scroll_customization::kScrollDirectionPanX) ==
+        scroll_customization::kScrollDirectionPanX)
       list->Append(*CSSIdentifierValue::Create(CSSValuePanX));
     else if (scroll_customization &
-             ScrollCustomization::kScrollDirectionPanLeft)
+             scroll_customization::kScrollDirectionPanLeft)
       list->Append(*CSSIdentifierValue::Create(CSSValuePanLeft));
     else if (scroll_customization &
-             ScrollCustomization::kScrollDirectionPanRight)
+             scroll_customization::kScrollDirectionPanRight)
       list->Append(*CSSIdentifierValue::Create(CSSValuePanRight));
-    if ((scroll_customization & ScrollCustomization::kScrollDirectionPanY) ==
-        ScrollCustomization::kScrollDirectionPanY)
+    if ((scroll_customization & scroll_customization::kScrollDirectionPanY) ==
+        scroll_customization::kScrollDirectionPanY)
       list->Append(*CSSIdentifierValue::Create(CSSValuePanY));
-    else if (scroll_customization & ScrollCustomization::kScrollDirectionPanUp)
+    else if (scroll_customization & scroll_customization::kScrollDirectionPanUp)
       list->Append(*CSSIdentifierValue::Create(CSSValuePanUp));
     else if (scroll_customization &
-             ScrollCustomization::kScrollDirectionPanDown)
+             scroll_customization::kScrollDirectionPanDown)
       list->Append(*CSSIdentifierValue::Create(CSSValuePanDown));
   }