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

third_party/WebKit/Source/core/style/BorderValue.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
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #ifndef BorderValue_h
 #define BorderValue_h
 
 #include "core/css/StyleColor.h"
-#include "core/style/BorderColorAndStyle.h"
+#include "core/style/BorderStyle.h"
 #include "core/style/ComputedStyleConstants.h"
 #include "platform/graphics/Color.h"
 #include "platform/wtf/Allocator.h"
 
 namespace blink {
 
 class BorderValue {
   DISALLOW_NEW();
   friend class ComputedStyle;
 
  public:
   BorderValue()
       : color_(0),
         color_is_current_color_(true),
         style_(kBorderStyleNone),
         is_auto_(kOutlineIsAutoOff) {
     SetWidth(3);
   }
 
-  BorderValue(const BorderColorAndStyle& data, float width) {
-    SetColor(data.GetColor());
-    SetColorIsCurrentColor(ColorIsCurrentColor());
+  BorderValue(const BorderStyle& data, const StyleColor& color, float width) {
+    SetColor(color.Resolve(Color()));
     SetStyle(data.Style());
     SetIsAuto(data.IsAuto());
     SetWidth(width);
   }
 
   bool NonZero() const { return Width() && (style_ != kBorderStyleNone); }
 
   bool IsTransparent() const {
     return !color_is_current_color_ && !color_.Alpha();
   }
@@ skipping 60 matching lines @@
   unsigned width_ : 26;  // Fixed point width
   unsigned style_ : 4;   // EBorderStyle
 
   // This is only used by OutlineValue but moved here to keep the bits packed.
   unsigned is_auto_ : 1;  // OutlineIsAuto
 };
 
 }  // namespace blink
 
 #endif  // BorderValue_h