Store border-*-style on SurroundData in ComputedStyle

third_party/WebKit/Source/core/style/ComputedStyle.cpp

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 756 matching lines @@
   if (IsDisplayTableType(Display())) {
     if (BorderCollapse() != other.BorderCollapse() ||
         EmptyCells() != other.EmptyCells() ||
         CaptionSide() != other.CaptionSide() ||
         TableLayout() != other.TableLayout())
       return true;
 
     // In the collapsing border model, 'hidden' suppresses other borders, while
     // 'none' does not, so these style differences can be width differences.
     if ((BorderCollapse() == EBorderCollapse::kCollapse) &&
-        ((BorderTopStyle() == kBorderStyleHidden &&
-          other.BorderTopStyle() == kBorderStyleNone) ||
-         (BorderTopStyle() == kBorderStyleNone &&
-          other.BorderTopStyle() == kBorderStyleHidden) ||
-         (BorderBottomStyle() == kBorderStyleHidden &&
-          other.BorderBottomStyle() == kBorderStyleNone) ||
-         (BorderBottomStyle() == kBorderStyleNone &&
-          other.BorderBottomStyle() == kBorderStyleHidden) ||
-         (BorderLeftStyle() == kBorderStyleHidden &&
-          other.BorderLeftStyle() == kBorderStyleNone) ||
-         (BorderLeftStyle() == kBorderStyleNone &&
-          other.BorderLeftStyle() == kBorderStyleHidden) ||
-         (BorderRightStyle() == kBorderStyleHidden &&
-          other.BorderRightStyle() == kBorderStyleNone) ||
-         (BorderRightStyle() == kBorderStyleNone &&
-          other.BorderRightStyle() == kBorderStyleHidden)))
+        ((BorderTopStyle() == EBorderStyle::kHidden &&
+          other.BorderTopStyle() == EBorderStyle::kNone) ||
+         (BorderTopStyle() == EBorderStyle::kNone &&
+          other.BorderTopStyle() == EBorderStyle::kHidden) ||
+         (BorderBottomStyle() == EBorderStyle::kHidden &&
+          other.BorderBottomStyle() == EBorderStyle::kNone) ||
+         (BorderBottomStyle() == EBorderStyle::kNone &&
+          other.BorderBottomStyle() == EBorderStyle::kHidden) ||
+         (BorderLeftStyle() == EBorderStyle::kHidden &&
+          other.BorderLeftStyle() == EBorderStyle::kNone) ||
+         (BorderLeftStyle() == EBorderStyle::kNone &&
+          other.BorderLeftStyle() == EBorderStyle::kHidden) ||
+         (BorderRightStyle() == EBorderStyle::kHidden &&
+          other.BorderRightStyle() == EBorderStyle::kNone) ||
+         (BorderRightStyle() == EBorderStyle::kNone &&
+          other.BorderRightStyle() == EBorderStyle::kHidden)))
       return true;
   } else if (Display() == EDisplay::kListItem) {
     if (ListStyleType() != other.ListStyleType() ||
         ListStylePosition() != other.ListStylePosition())
       return true;
   }
 
   if ((Visibility() == EVisibility::kCollapse) !=
       (other.Visibility() == EVisibility::kCollapse))
     return true;
@@ skipping 59 matching lines @@
       return true;
   }
 
   return false;
 }
 
 bool ComputedStyle::DiffNeedsPaintInvalidationObject(
     const ComputedStyle& other) const {
   if (Visibility() != other.Visibility() ||
       PrintColorAdjust() != other.PrintColorAdjust() ||
-      InsideLink() != other.InsideLink() ||
-      !Border().VisuallyEqual(other.Border()) || !RadiiEqual(other) ||
-      !BorderColorVisuallyEquals(other) || !BorderSizeEquals(other) ||
-      *background_data_ != *other.background_data_)
+      InsideLink() != other.InsideLink() || !BorderVisuallyEqual(other) ||
+      !RadiiEqual(other) || *background_data_ != *other.background_data_)
     return true;
 
   if (rare_inherited_data_.Get() != other.rare_inherited_data_.Get()) {
     if (rare_inherited_data_->user_modify_ !=
             other.rare_inherited_data_->user_modify_ ||
         rare_inherited_data_->user_select_ !=
             other.rare_inherited_data_->user_select_ ||
         rare_inherited_data_->image_rendering_ !=
             other.rare_inherited_data_->image_rendering_)
       return true;
@@ skipping 1207 matching lines @@
         text_stroke_style_color.GetColor().Alpha())
       return text_stroke_style_color;
   }
 
   return visited_link ? VisitedLinkTextFillColor() : TextFillColor();
 }
 
 Color ComputedStyle::ColorIncludingFallback(int color_property,
                                             bool visited_link) const {
   StyleColor result(StyleColor::CurrentColor());
-  EBorderStyle border_style = kBorderStyleNone;
+  EBorderStyle border_style = EBorderStyle::kNone;
   switch (color_property) {
     case CSSPropertyBackgroundColor:
       result = visited_link ? VisitedLinkBackgroundColor() : BackgroundColor();
       break;
     case CSSPropertyBorderLeftColor:
       result = visited_link ? VisitedLinkBorderLeftColor() : BorderLeftColor();
       border_style = BorderLeftStyle();
       break;
     case CSSPropertyBorderRightColor:
       result =
@@ skipping 55 matching lines @@
     default:
       NOTREACHED();
       break;
   }
 
   if (!result.IsCurrentColor())
     return result.GetColor();
 
   // FIXME: Treating styled borders with initial color differently causes
   // problems, see crbug.com/316559, crbug.com/276231
-  if (!visited_link &&
-      (border_style == kBorderStyleInset ||
-       border_style == kBorderStyleOutset ||
-       border_style == kBorderStyleRidge || border_style == kBorderStyleGroove))
+  if (!visited_link && (border_style == EBorderStyle::kInset ||
+                        border_style == EBorderStyle::kOutset ||
+                        border_style == EBorderStyle::kRidge ||
+                        border_style == EBorderStyle::kGroove))
     return Color(238, 238, 238);
   return visited_link ? VisitedLinkColor() : GetColor();
 }
 
 Color ComputedStyle::VisitedDependentColor(int color_property) const {
   Color unvisited_color = ColorIncludingFallback(color_property, false);
   if (InsideLink() != EInsideLink::kInsideVisitedLink)
     return unvisited_color;
 
   Color visited_color = ColorIncludingFallback(color_property, true);
@@ skipping 312 matching lines @@
     if (value < 0)
       fvalue -= 0.5f;
     else
       fvalue += 0.5f;
   }
 
   return RoundForImpreciseConversion<int>(fvalue / zoom_factor);
 }
 
 }  // namespace blink