Store border-*-color on SurroundData in ComputedStyle not BorderColorAndStyle

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 544 matching lines @@
   // border-bottom-style
   EBorderStyle BorderBottomStyle() const {
     return surround_data_->border_.Bottom().Style();
   }
   void SetBorderBottomStyle(EBorderStyle v) {
     SET_VAR(surround_data_, border_.bottom_.style_, v);
   }
 
   // Border color properties.
   // border-left-color
-  void SetBorderLeftColor(const StyleColor& v) {
-    SET_BORDERVALUE_COLOR(surround_data_, border_.left_, v);
+  void SetBorderLeftColor(const StyleColor& color) {
+    SetBorderLeftColorInternal(color.Resolve(Color()));
+    SetBorderLeftColorIsCurrentColor(color.IsCurrentColor());
   }
 
   // border-right-color
-  void SetBorderRightColor(const StyleColor& v) {
-    SET_BORDERVALUE_COLOR(surround_data_, border_.right_, v);
+  void SetBorderRightColor(const StyleColor& color) {
+    SetBorderRightColorInternal(color.Resolve(Color()));
+    SetBorderRightColorIsCurrentColor(color.IsCurrentColor());
   }
 
   // border-top-color
-  void SetBorderTopColor(const StyleColor& v) {
-    SET_BORDERVALUE_COLOR(surround_data_, border_.top_, v);
+  void SetBorderTopColor(const StyleColor& color) {
+    SetBorderTopColorInternal(color.Resolve(Color()));
+    SetBorderTopColorIsCurrentColor(color.IsCurrentColor());
   }
 
   // border-bottom-color
-  void SetBorderBottomColor(const StyleColor& v) {
-    SET_BORDERVALUE_COLOR(surround_data_, border_.bottom_, v);

[shend, 2017/05/09 07:24:41]

Can we get rid of this macro now?

[nainar, 2017/05/09 07:40:39]

Nope. Needed by BorderValue. 

+  void SetBorderBottomColor(const StyleColor& color) {
+    SetBorderBottomColorInternal(color.Resolve(Color()));
+    SetBorderBottomColorIsCurrentColor(color.IsCurrentColor());
   }
 
   // box-shadow (aka -webkit-box-shadow)
   static ShadowList* InitialBoxShadow() { return 0; }
   ShadowList* BoxShadow() const {
     return rare_non_inherited_data_->box_shadow_.Get();
   }
   void SetBoxShadow(PassRefPtr<ShadowList>);
 
   // box-sizing (aka -webkit-box-sizing)
@@ skipping 2247 matching lines @@
     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_; }
   const BorderValue BorderLeft() const {
-    return BorderValue(surround_data_->border_.Left(), BorderLeftWidth());
+    return BorderValue(surround_data_->border_.Left(),
+                       VisitedDependentColor(CSSPropertyBorderLeftColor),
+                       BorderLeftWidth());
   }
   const BorderValue BorderRight() const {
-    return BorderValue(surround_data_->border_.Right(), BorderRightWidth());
+    return BorderValue(surround_data_->border_.Right(),
+                       VisitedDependentColor(CSSPropertyBorderRightColor),
+                       BorderRightWidth());
   }
   const BorderValue BorderTop() const {
-    return BorderValue(surround_data_->border_.Top(), BorderTopWidth());
+    return BorderValue(surround_data_->border_.Top(),
+                       VisitedDependentColor(CSSPropertyBorderTopColor),
+                       BorderTopWidth());
   }
   const BorderValue BorderBottom() const {
-    return BorderValue(surround_data_->border_.Bottom(), BorderBottomWidth());
+    return BorderValue(surround_data_->border_.Bottom(),
+                       VisitedDependentColor(CSSPropertyBorderBottomColor),
+                       BorderBottomWidth());
   }
   bool BorderSizeEquals(const ComputedStyle& o) const {
     return BorderWidthEquals(BorderLeftWidth(), o.BorderLeftWidth()) &&
            BorderWidthEquals(BorderTopWidth(), o.BorderTopWidth()) &&
            BorderWidthEquals(BorderRightWidth(), o.BorderRightWidth()) &&
            BorderWidthEquals(BorderBottomWidth(), o.BorderBottomWidth());
   }
   const BorderValue BorderBefore() const;
   const BorderValue BorderAfter() const;
   const BorderValue BorderStart() const;
@@ skipping 16 matching lines @@
       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 Border().HasBorderColorReferencingCurrentColor();
+    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();
   }
 
   void ResetBorder() {
     ResetBorderImage();
     ResetBorderTop();
     ResetBorderRight();
     ResetBorderBottom();
     ResetBorderLeft();
     ResetBorderTopLeftRadius();
     ResetBorderTopRightRadius();
     ResetBorderBottomLeftRadius();
     ResetBorderBottomRightRadius();
   }
   void ResetBorderTop() {
-    SET_VAR(surround_data_, border_.top_, BorderColorAndStyle());
+    SET_VAR(surround_data_, border_.top_, BorderStyle());
     SetBorderTopWidth(3);
   }
   void ResetBorderRight() {
-    SET_VAR(surround_data_, border_.right_, BorderColorAndStyle());
+    SET_VAR(surround_data_, border_.right_, BorderStyle());
     SetBorderRightWidth(3);
   }
   void ResetBorderBottom() {
-    SET_VAR(surround_data_, border_.bottom_, BorderColorAndStyle());
+    SET_VAR(surround_data_, border_.bottom_, BorderStyle());
     SetBorderBottomWidth(3);
   }
   void ResetBorderLeft() {
-    SET_VAR(surround_data_, border_.left_, BorderColorAndStyle());
+    SET_VAR(surround_data_, border_.left_, BorderStyle());
     SetBorderLeftWidth(3);
   }
   void ResetBorderImage() {
     SET_VAR(surround_data_, border_.image_, NinePieceImage());
   }
 
   void SetBorderRadius(const LengthSize& s) {
     SetBorderTopLeftRadius(s);
     SetBorderTopRightRadius(s);
     SetBorderBottomLeftRadius(s);
@@ skipping 542 matching lines @@
            display == EDisplay::kTableRow ||
            display == EDisplay::kTableColumnGroup ||
            display == EDisplay::kTableColumn ||
            display == EDisplay::kTableCell ||
            display == EDisplay::kTableCaption;
   }
 
   // Color accessors are all private to make sure callers use
   // VisitedDependentColor instead to access them.
   StyleColor BorderLeftColor() const {
-    return surround_data_->border_.Left().GetColor();
+    return BorderLeftColorIsCurrentColor()
+               ? StyleColor::CurrentColor()
+               : StyleColor(BorderBottomColorInternal());
   }
   StyleColor BorderRightColor() const {
-    return surround_data_->border_.Right().GetColor();
+    return BorderRightColorIsCurrentColor()
+               ? StyleColor::CurrentColor()
+               : StyleColor(BorderBottomColorInternal());
   }
   StyleColor BorderTopColor() const {
-    return surround_data_->border_.Top().GetColor();
+    return BorderTopColorIsCurrentColor()
+               ? StyleColor::CurrentColor()
+               : StyleColor(BorderBottomColorInternal());
   }
   StyleColor BorderBottomColor() const {
-    return surround_data_->border_.Bottom().GetColor();
+    return BorderBottomColorIsCurrentColor()
+               ? StyleColor::CurrentColor()
+               : StyleColor(BorderBottomColorInternal());
   }
   StyleColor BackgroundColor() const {
     return background_data_->background_color_;
   }
   StyleAutoColor CaretColor() const {
     return rare_inherited_data_->CaretColor();
   }
   Color GetColor() const;
   StyleColor ColumnRuleColor() const {
     return rare_non_inherited_data_->multi_col_->rule_.GetColor();
@@ skipping 180 matching lines @@
       PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
 }
 
 inline bool ComputedStyle::HasPseudoElementStyle() const {
   return PseudoBitsInternal() & kElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h