Split has_custom_compare_and_copy in ComputedStyleExtraFields.json5.

third_party/WebKit/Source/core/css/ComputedStyleExtraFields.json5

 {
 // This file specifies fields in ComputedStyle that we would like to
 // generate, but are not CSS properties.
 
   parameters: {
-    // If the field has_custom_compare_and_copy, then it does not appear in
-    // ComputedStyle::operator== and ComputedStyle::CopyNonInheritedFromCached.
-    has_custom_compare_and_copy: {
+    // If true, we do not include this field in ComputedStyleBase::InheritFrom
+    // and ComputedStyleBase::CopyNonInheritedFromCached.
+    custom_copy: {
       default: false,
     },
 
+    // If true, we do not include this field in ComputedStyleBase::InheritedEqual
+    // and ComputedStyleBase::NonInheritedEqual.
+    custom_compare: {
+      default: false,
+    },
+
     // The rest is the same as CSSProperties.json5, but the only relevant ones in
     // this file are:
     // name, field_template, include_paths, default_value, type_name, keyword,
     // inherited
   },
 
   data: [
     {
       name: "IsLink",
       field_template: "monotonic_flag",
       default_value: "false",
-      has_custom_compare_and_copy: true,
+      custom_copy: true,
+      custom_compare: true,
     },
     {
       name: "BorderLeftColorIsCurrentColor",
       field_template: "primitive",
       default_value: "true",
       type_name: "bool",
       field_group: "surround",
     },
     {
       name: "BorderRightColorIsCurrentColor",
@@ skipping 26 matching lines @@
           "table-footer-group", "table-row", "table-column-group", "table-column", "table-cell", "table-caption", "-webkit-box",
           "-webkit-inline-box", "flex", "inline-flex", "grid", "inline-grid", "contents", "flow-root", "none",
       ],
     },
     {
       name: "InsideLink",
       field_template: "keyword",
       default_value: "not-inside-link",
       keywords: ["not-inside-link", "inside-unvisited-link", "inside-visited-link"],
       inherited: true,
-      has_custom_compare_and_copy: true,
     },
     // Style can not be shared.
     {
       name: "Unique",
       field_template: "monotonic_flag",
       default_value: "false",
-      has_custom_compare_and_copy: true,
+      custom_copy: true,
+      custom_compare: true,
     },
     // Whether this style is affected by these pseudo-classes.
     {
       name: "AffectedByFocus",
       field_template: "monotonic_flag",
       default_value: "false",
-      has_custom_compare_and_copy: true,
+      custom_copy: true,
+      custom_compare: true,
     },
     {
       name: "AffectedByFocusWithin",
       field_template: "monotonic_flag",
       default_value: "false",
-      has_custom_compare_and_copy: true,
+      custom_copy: true,
+      custom_compare: true,
     },
     {
       name: "AffectedByHover",
       field_template: "monotonic_flag",
       default_value: "false",
-      has_custom_compare_and_copy: true,
+      custom_copy: true,
+      custom_compare: true,
     },
     {
       name: "AffectedByActive",
       field_template: "monotonic_flag",
       default_value: "false",
-      has_custom_compare_and_copy: true,
+      custom_copy: true,
+      custom_compare: true,
     },
     {
       name: "AffectedByDrag",
       field_template: "monotonic_flag",
       default_value: "false",
-      has_custom_compare_and_copy: true,
+      custom_copy: true,
+      custom_compare: true,
     },
     // A non-inherited property references a variable or @apply is used
     {
       name: "HasVariableReferenceFromNonInheritedProperty",
       field_template: "monotonic_flag",
       default_value: "false",
-      has_custom_compare_and_copy: true,
+      custom_copy: true,
+      custom_compare: true,
     },
     // Explicitly inherits a non-inherited property
     {
       name: "HasExplicitlyInheritedProperties",
       field_template: "monotonic_flag",
       default_value: "false",
-      has_custom_compare_and_copy: true,
+      custom_copy: true,
+      custom_compare: true,
     },
     // These are set if we used viewport or rem units when resolving a length.
     // TODO(shend): HasViewportUnits should be a monotonic_flag.
     {
       name: "HasViewportUnits",
       field_template: "primitive",
       default_value: "false",
       type_name: "bool",
-      has_custom_compare_and_copy: true,
+      custom_compare: true,
     },
     {
       name: "HasRemUnits",
       field_template: "monotonic_flag",
       default_value: "false",
-      has_custom_compare_and_copy: true,
+      custom_compare: true,
     },
     // These properties only have generated storage, and their methods are handwritten in ComputedStyle.
     // TODO(shend): Remove these fields and delete the 'storage_only' template.
     {
       name: "EmptyState",
       field_template: "storage_only",
       field_size: 1,
       default_value: "false",
       type_name: "bool",
-      has_custom_compare_and_copy: true,
+      custom_copy: true,
+      custom_compare: true,
     },
     {
       name: "StyleType",
       field_template: "storage_only",
       field_size: 6,
       default_value: "0",
       type_name: "PseudoId",
-      has_custom_compare_and_copy: true,
+      custom_copy: true,
+      custom_compare: true,
     },
     {
       name: "PseudoBits",
       field_template: "storage_only",
       field_size: 8,
       default_value: "kPseudoIdNone",
       type_name: "PseudoId",
-      has_custom_compare_and_copy: true,
+      custom_copy: true,
+      custom_compare: true,
     },
     // True if 'underline solid' is the only text decoration on this element.
     {
       name: "HasSimpleUnderline",
       field_template: "storage_only",
       field_size: 1,
       default_value: "false",
       type_name: "bool",
       inherited: true,
-      has_custom_compare_and_copy: true,
     },
     // TODO(shend): vertical align is actually a CSS property, but since we don't support union fields
     // which can be either a keyword or Length, this is specified in this file for now. Remove this
     // once we can support union fields.
     {
       name: "VerticalAlign",
       field_template: "storage_only",
       field_size: 4,
       default_value: "EVerticalAlign::kBaseline",
       type_name: "EVerticalAlign",
@@ skipping 366 matching lines @@
       inherited: true,
       field_template: "storage_only",
       type_name: "StyleInheritedVariables",
       include_paths: ["core/style/StyleInheritedVariables.h"],
       default_value: "nullptr",
       wrapper_pointer_name: "RefPtr",
       field_group: "rare-inherited",
     },
   ],
 }