Invalidate collapsed borders using currentColor when color changes

third_party/WebKit/Source/core/style/CollapsedBorderValue.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 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
  * License as published by the Free Software Foundation; either
@@ skipping 18 matching lines @@
 #include "platform/wtf/Allocator.h"
 
 namespace blink {
 
 class CollapsedBorderValue {
   DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
 
  public:
   CollapsedBorderValue()
       : color_(0),
-        color_is_current_color_(true),
         width_(0),
         style_(kBorderStyleNone),
         precedence_(kBorderPrecedenceOff),
         transparent_(false) {}
 
   CollapsedBorderValue(const BorderValue& border,
-                       const StyleColor& color,
+                       const Color& color,

[Xianzhu, 2017/04/24 21:09:22]

Actually we always pass Color instead of StyleColor here. Previously the Color
passed in was automatically converted into StyleColor whose IsCurrentColor() was
always false. 

                        EBorderPrecedence precedence)
-      : color_(color.Resolve(Color())),
-        color_is_current_color_(color.IsCurrentColor()),
+      : color_(color),
         width_(border.NonZero() ? border.Width() : 0),
         style_(border.Style()),
         precedence_(precedence),
         transparent_(border.IsTransparent()) {}
 
   unsigned Width() const { return style_ > kBorderStyleHidden ? width_ : 0; }
   EBorderStyle Style() const { return static_cast<EBorderStyle>(style_); }
   bool Exists() const { return precedence_ != kBorderPrecedenceOff; }
-  StyleColor GetColor() const {
-    return color_is_current_color_ ? StyleColor::CurrentColor()
-                                   : StyleColor(color_);
-  }
+  Color GetColor() const { return color_; }
   bool IsTransparent() const { return transparent_; }
   EBorderPrecedence Precedence() const {
     return static_cast<EBorderPrecedence>(precedence_);
   }
 
   bool IsSameIgnoringColor(const CollapsedBorderValue& o) const {
     return Width() == o.Width() && Style() == o.Style() &&
            Precedence() == o.Precedence();
   }
 
   bool VisuallyEquals(const CollapsedBorderValue& o) const {
     if (!IsVisible() && !o.IsVisible())
       return true;
     return GetColor() == o.GetColor() && IsTransparent() == o.IsTransparent() &&
            IsSameIgnoringColor(o);
   }
 
   bool IsVisible() const {
     return Style() > kBorderStyleHidden && !IsTransparent() && Exists();
   }
 
   bool ShouldPaint(
       const CollapsedBorderValue& table_current_border_value) const {
     return IsVisible() && IsSameIgnoringColor(table_current_border_value);
   }
 
  private:
   Color color_;
-  unsigned color_is_current_color_ : 1;
-  unsigned width_ : 23;
+  unsigned width_ : 24;
   unsigned style_ : 4;       // EBorderStyle
   unsigned precedence_ : 3;  // EBorderPrecedence
   unsigned transparent_ : 1;
 };
 
 }  // namespace blink
 
 #endif  // CollapsedBorderValue_h