Store border-*-style on SurroundData in ComputedStyle

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

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 456 matching lines @@
     return surround_data_->border_.GetImage().Outset();
   }
   void SetBorderImageOutset(const BorderImageLengthBox&);
 
   // Border width properties.
   static float InitialBorderWidth() { return 3; }
 
   // TODO(nainar): Move all fixed point logic to a separate class.
   // border-top-width
   float BorderTopWidth() const {
-    if (surround_data_->border_.top_.Style() == EBorderStyle::kNone ||
-        surround_data_->border_.top_.Style() == EBorderStyle::kHidden)
+    if (BorderTopStyle() == EBorderStyle::kNone ||
+        BorderTopStyle() == EBorderStyle::kHidden)
       return 0;
     return static_cast<float>(BorderTopWidthInternal()) /
            kBorderWidthDenominator;
   }
   void SetBorderTopWidth(float v) {
     SetBorderTopWidthInternal(WidthToFixedPoint(v));
   }
+  bool BorderTopNonZero() const {
+    return BorderTopWidth() && (BorderTopStyle() != EBorderStyle::kNone);
+  }
 
   // border-bottom-width
   float BorderBottomWidth() const {
-    if (surround_data_->border_.bottom_.Style() == EBorderStyle::kNone ||
-        surround_data_->border_.bottom_.Style() == EBorderStyle::kHidden)
+    if (BorderBottomStyle() == EBorderStyle::kNone ||
+        BorderBottomStyle() == EBorderStyle::kHidden)
       return 0;
     return static_cast<float>(BorderBottomWidthInternal()) /
            kBorderWidthDenominator;
   }
   void SetBorderBottomWidth(float v) {
     SetBorderBottomWidthInternal(WidthToFixedPoint(v));
   }
+  bool BorderBottomNonZero() const {
+    return BorderBottomWidth() && (BorderBottomStyle() != EBorderStyle::kNone);
+  }
 
   // border-left-width
   float BorderLeftWidth() const {
-    if (surround_data_->border_.left_.Style() == EBorderStyle::kNone ||
-        surround_data_->border_.left_.Style() == EBorderStyle::kHidden)
+    if (BorderLeftStyle() == EBorderStyle::kNone ||
+        BorderLeftStyle() == EBorderStyle::kHidden)
       return 0;
     return static_cast<float>(BorderLeftWidthInternal()) /
            kBorderWidthDenominator;
   }
   void SetBorderLeftWidth(float v) {
     SetBorderLeftWidthInternal(WidthToFixedPoint(v));
   }
+  bool BorderLeftNonZero() const {
+    return BorderLeftWidth() && (BorderLeftStyle() != EBorderStyle::kNone);
+  }
 
   // border-right-width
   float BorderRightWidth() const {
-    if (surround_data_->border_.right_.Style() == EBorderStyle::kNone ||
-        surround_data_->border_.right_.Style() == EBorderStyle::kHidden)
+    if (BorderRightStyle() == EBorderStyle::kNone ||
+        BorderRightStyle() == EBorderStyle::kHidden)
       return 0;
     return static_cast<float>(BorderRightWidthInternal()) /
            kBorderWidthDenominator;
   }
   void SetBorderRightWidth(float v) {
     SetBorderRightWidthInternal(WidthToFixedPoint(v));
   }
-
-  // Border style properties.
-  static EBorderStyle InitialBorderStyle() { return EBorderStyle::kNone; }
-
-  // border-top-style
-  EBorderStyle BorderTopStyle() const {
-    return surround_data_->border_.Top().Style();
-  }
-  void SetBorderTopStyle(EBorderStyle v) {
-    SET_VAR(surround_data_, border_.top_.style_, static_cast<unsigned>(v));
+  bool BorderRightNonZero() const {
+    return BorderRightWidth() && (BorderRightStyle() != EBorderStyle::kNone);
   }
 
-  // border-right-style
-  EBorderStyle BorderRightStyle() const {
-    return surround_data_->border_.Right().Style();
-  }
-  void SetBorderRightStyle(EBorderStyle v) {
-    SET_VAR(surround_data_, border_.right_.style_, static_cast<unsigned>(v));
-  }
-
-  // border-left-style
-  EBorderStyle BorderLeftStyle() const {
-    return surround_data_->border_.Left().Style();
-  }
-  void SetBorderLeftStyle(EBorderStyle v) {
-    SET_VAR(surround_data_, border_.left_.style_, static_cast<unsigned>(v));
-  }
-
-  // border-bottom-style
-  EBorderStyle BorderBottomStyle() const {
-    return surround_data_->border_.Bottom().Style();
-  }
-  void SetBorderBottomStyle(EBorderStyle v) {
-    SET_VAR(surround_data_, border_.bottom_.style_, static_cast<unsigned>(v));
-  }
+  static EBorderStyle InitialColumnRuleStyle() { return EBorderStyle::kNone; }
 
   // Border color properties.
   // border-left-color
   void SetBorderLeftColor(const StyleColor& color) {
     if (!compareEqual(BorderLeftColor(), color)) {
       SetBorderLeftColorInternal(color.Resolve(Color()));
       SetBorderLeftColorIsCurrentColor(color.IsCurrentColor());
     }
   }
 
@@ skipping 2250 matching lines @@
   bool HasBorderImageOutsets() const {
     return BorderImage().HasImage() && BorderImage().Outset().NonZero();
   }
   LayoutRectOutsets BorderImageOutsets() const {
     return ImageOutsets(BorderImage());
   }
   bool BorderImageSlicesFill() const { return Border().GetImage().Fill(); }
 
   void SetBorderImageSlicesFill(bool);
   const BorderData& Border() const { return surround_data_->border_; }
-  BorderValue BorderLeft() const {
-    return BorderValue(surround_data_->border_.Left(), BorderLeftColor(),
-                       BorderLeftWidth());
+  const BorderValue BorderLeft() const {
+    return BorderValue(BorderLeftStyle(), BorderLeftColor(), BorderLeftWidth());
   }
-  BorderValue BorderRight() const {
-    return BorderValue(surround_data_->border_.Right(), BorderRightColor(),
+  const BorderValue BorderRight() const {
+    return BorderValue(BorderRightStyle(), BorderRightColor(),
                        BorderRightWidth());
   }
-  BorderValue BorderTop() const {
-    return BorderValue(surround_data_->border_.Top(), BorderTopColor(),
-                       BorderTopWidth());
+  const BorderValue BorderTop() const {
+    return BorderValue(BorderTopStyle(), BorderTopColor(), BorderTopWidth());
   }
-  BorderValue BorderBottom() const {
-    return BorderValue(surround_data_->border_.Bottom(), BorderBottomColor(),
+  const BorderValue BorderBottom() const {
+    return BorderValue(BorderBottomStyle(), BorderBottomColor(),
                        BorderBottomWidth());
   }
+
   bool BorderSizeEquals(const ComputedStyle& o) const {
     return BorderWidthEquals(BorderLeftWidth(), o.BorderLeftWidth()) &&
            BorderWidthEquals(BorderTopWidth(), o.BorderTopWidth()) &&
            BorderWidthEquals(BorderRightWidth(), o.BorderRightWidth()) &&
            BorderWidthEquals(BorderBottomWidth(), o.BorderBottomWidth());
   }
+
   BorderValue BorderBefore() const;
   BorderValue BorderAfter() const;
   BorderValue BorderStart() const;
   BorderValue BorderEnd() const;
   float BorderAfterWidth() const;
   float BorderBeforeWidth() const;
   float BorderEndWidth() const;
   float BorderStartWidth() const;
   float BorderOverWidth() const;
   float BorderUnderWidth() const;
 
   bool HasBorderFill() const { return Border().HasBorderFill(); }
   bool HasBorder() const {
-    return Border().HasBorder() || BorderLeftWidth() || BorderRightWidth() ||
-           BorderTopWidth() || BorderBottomWidth();
+    return BorderLeftNonZero() || BorderRightNonZero() || BorderTopNonZero() ||
+           BorderBottomNonZero();
   }
   bool HasBorderDecoration() const { return HasBorder() || HasBorderFill(); }
   bool HasBorderRadius() const {
     if (!BorderTopLeftRadius().Width().IsZero())
       return true;
     if (!BorderTopRightRadius().Width().IsZero())
       return true;
     if (!BorderBottomLeftRadius().Width().IsZero())
       return true;
     if (!BorderBottomRightRadius().Width().IsZero())
       return true;
     return false;
   }
   bool HasBorderColorReferencingCurrentColor() const {
     return (BorderLeft().NonZero() && BorderLeftColor().IsCurrentColor()) ||
            (BorderRight().NonZero() && BorderRightColor().IsCurrentColor()) ||
            (BorderTop().NonZero() && BorderTopColor().IsCurrentColor()) ||
            (BorderBottom().NonZero() && BorderBottomColor().IsCurrentColor());
   }
 
   bool RadiiEqual(const ComputedStyle& o) const {
     return BorderTopLeftRadius() == o.BorderTopLeftRadius() &&
            BorderTopRightRadius() == o.BorderTopRightRadius() &&
            BorderBottomLeftRadius() == o.BorderBottomLeftRadius() &&
            BorderBottomRightRadius() == o.BorderBottomRightRadius();
   }
 
-  bool BorderColorEquals(const ComputedStyle& o) const {
-    return (BorderLeftColorInternal() == o.BorderLeftColorInternal() &&
-            BorderRightColorInternal() == o.BorderRightColorInternal() &&
-            BorderTopColorInternal() == o.BorderTopColorInternal() &&
-            BorderBottomColorInternal() == o.BorderBottomColorInternal()) &&
-           (BorderLeftColorIsCurrentColor() ==
-                o.BorderLeftColorIsCurrentColor() &&
-            BorderRightColorIsCurrentColor() ==
-                o.BorderRightColorIsCurrentColor() &&
-            BorderTopColorIsCurrentColor() ==
-                o.BorderTopColorIsCurrentColor() &&
-            BorderBottomColorIsCurrentColor() ==
-                o.BorderBottomColorIsCurrentColor());
+  bool BorderLeftEquals(const ComputedStyle& o) const {
+    return BorderLeftWidthInternal() == o.BorderLeftWidthInternal() &&
+           BorderLeftStyle() == o.BorderLeftStyle() &&
+           BorderLeftColor() == o.BorderLeftColor() &&
+           BorderLeftColorIsCurrentColor() == o.BorderLeftColorIsCurrentColor();
   }
 
-  bool BorderColorVisuallyEquals(const ComputedStyle& o) const {
-    if ((BorderLeftStyle() == EBorderStyle::kNone &&
-         o.BorderLeftStyle() == EBorderStyle::kNone) &&
-        (BorderRightStyle() == EBorderStyle::kNone &&
-         o.BorderRightStyle() == EBorderStyle::kNone) &&
-        (BorderTopStyle() == EBorderStyle::kNone &&
-         o.BorderTopStyle() == EBorderStyle::kNone) &&
-        (BorderBottomStyle() == EBorderStyle::kNone &&
-         o.BorderBottomStyle() == EBorderStyle::kNone))
+  bool BorderLeftVisuallyEqual(const ComputedStyle& o) const {
+    if (BorderLeftStyle() == EBorderStyle::kNone &&
+        o.BorderLeftStyle() == EBorderStyle::kNone)
       return true;
-    if ((BorderLeftStyle() == EBorderStyle::kHidden &&
-         o.BorderLeftStyle() == EBorderStyle::kHidden) &&
-        (BorderRightStyle() == EBorderStyle::kHidden &&
-         o.BorderRightStyle() == EBorderStyle::kHidden) &&
-        (BorderTopStyle() == EBorderStyle::kHidden &&
-         o.BorderTopStyle() == EBorderStyle::kHidden) &&
-        (BorderBottomStyle() == EBorderStyle::kHidden &&
-         o.BorderBottomStyle() == EBorderStyle::kHidden))
+    if (BorderLeftStyle() == EBorderStyle::kHidden &&
+        o.BorderLeftStyle() == EBorderStyle::kHidden)
       return true;
-    return BorderColorEquals(o);
+    return BorderLeftEquals(o);
+  }
+
+  bool BorderRightEquals(const ComputedStyle& o) const {
+    return BorderRightWidthInternal() == o.BorderRightWidthInternal() &&
+           BorderRightStyle() == o.BorderRightStyle() &&
+           BorderRightColor() == o.BorderRightColor() &&
+           BorderRightColorIsCurrentColor() ==
+               o.BorderRightColorIsCurrentColor();
+  }
+
+  bool BorderRightVisuallyEqual(const ComputedStyle& o) const {
+    if (BorderRightStyle() == EBorderStyle::kNone &&

[shend, 2017/05/17 22:18:34]

For the future, I think it might be possible to combine these two if statements
so that there's only three boolean expressions versus four:

if (BorderRightStyle() == o.BorderRightStyle() && (BorderRightStyle() ==
EBorderStyle::kNone || BorderRightStyle() == EBorderStyle::kHidden))

Not sure if it would be faster though.

[nainar, 2017/05/18 01:58:35]

Made note of this for a future CL. Yeah can't determine offhand what is better. 

+        o.BorderRightStyle() == EBorderStyle::kNone)
+      return true;
+    if (BorderRightStyle() == EBorderStyle::kHidden &&
+        o.BorderRightStyle() == EBorderStyle::kHidden)
+      return true;
+    return BorderRightEquals(o);
+  }
+
+  bool BorderTopVisuallyEqual(const ComputedStyle& o) const {
+    if (BorderTopStyle() == EBorderStyle::kNone &&
+        o.BorderTopStyle() == EBorderStyle::kNone)
+      return true;
+    if (BorderTopStyle() == EBorderStyle::kHidden &&
+        o.BorderTopStyle() == EBorderStyle::kHidden)
+      return true;
+    return BorderTopEquals(o);
+  }
+
+  bool BorderTopEquals(const ComputedStyle& o) const {
+    return BorderTopWidthInternal() == o.BorderTopWidthInternal() &&
+           BorderTopStyle() == o.BorderTopStyle() &&
+           BorderTopColor() == o.BorderTopColor() &&
+           BorderTopColorIsCurrentColor() == o.BorderTopColorIsCurrentColor();
+  }
+
+  bool BorderBottomVisuallyEqual(const ComputedStyle& o) const {
+    if (BorderBottomStyle() == EBorderStyle::kNone &&
+        o.BorderBottomStyle() == EBorderStyle::kNone)
+      return true;
+    if (BorderBottomStyle() == EBorderStyle::kHidden &&
+        o.BorderBottomStyle() == EBorderStyle::kHidden)
+      return true;
+    return BorderBottomEquals(o);
+  }
+
+  bool BorderBottomEquals(const ComputedStyle& o) const {
+    return BorderBottomWidthInternal() == o.BorderBottomWidthInternal() &&
+           BorderBottomStyle() == o.BorderBottomStyle() &&
+           BorderBottomColor() == o.BorderBottomColor() &&
+           BorderBottomColorIsCurrentColor() ==
+               o.BorderBottomColorIsCurrentColor();
+  }
+
+  bool BorderEquals(const ComputedStyle& o) const {
+    return BorderLeftEquals(o) && BorderRightEquals(o) && BorderTopEquals(o) &&
+           BorderBottomEquals(o) && BorderImage() == o.BorderImage();
+  }
+
+  bool BorderVisuallyEqual(const ComputedStyle& o) const {
+    return BorderLeftVisuallyEqual(o) && BorderRightVisuallyEqual(o) &&
+           BorderTopVisuallyEqual(o) && BorderBottomVisuallyEqual(o);
   }
 
   void ResetBorder() {
     ResetBorderImage();
     ResetBorderTop();
     ResetBorderRight();
     ResetBorderBottom();
     ResetBorderLeft();
     ResetBorderTopLeftRadius();
     ResetBorderTopRightRadius();
     ResetBorderBottomLeftRadius();
     ResetBorderBottomRightRadius();
   }
 
   void ResetBorderTop() {
-    SET_VAR(surround_data_, border_.top_, BorderStyle());
+    SetBorderTopStyle(EBorderStyle::kNone);
     SetBorderTopWidth(3);
     SetBorderTopColorInternal(0);
     SetBorderTopColorInternal(true);
+    SetBorderTopStyle(EBorderStyle::kNone);
   }
   void ResetBorderRight() {
-    SET_VAR(surround_data_, border_.right_, BorderStyle());
+    SetBorderRightStyle(EBorderStyle::kNone);
     SetBorderRightWidth(3);
     SetBorderRightColorInternal(0);
     SetBorderRightColorInternal(true);
+    SetBorderRightStyle(EBorderStyle::kNone);
   }
   void ResetBorderBottom() {
-    SET_VAR(surround_data_, border_.bottom_, BorderStyle());
+    SetBorderBottomStyle(EBorderStyle::kNone);
     SetBorderBottomWidth(3);
     SetBorderBottomColorInternal(0);
     SetBorderBottomColorInternal(true);
+    SetBorderBottomStyle(EBorderStyle::kNone);
   }
   void ResetBorderLeft() {
-    SET_VAR(surround_data_, border_.left_, BorderStyle());
+    SetBorderLeftStyle(EBorderStyle::kNone);
     SetBorderLeftWidth(3);
     SetBorderLeftColorInternal(0);
     SetBorderLeftColorInternal(true);
+    SetBorderLeftStyle(EBorderStyle::kNone);
   }
   void ResetBorderImage() {
     SET_VAR(surround_data_, border_.image_, NinePieceImage());
   }
 
   void SetBorderRadius(const LengthSize& s) {
     SetBorderTopLeftRadius(s);
     SetBorderTopRightRadius(s);
     SetBorderBottomLeftRadius(s);
     SetBorderBottomRightRadius(s);
@@ skipping 792 matching lines @@
       PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
 }
 
 inline bool ComputedStyle::HasPseudoElementStyle() const {
   return PseudoBitsInternal() & kElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h