Move border-*-width out of BorderValue and store on SurroundData in ComputedStyle instead

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

Index: third_party/WebKit/Source/core/style/BorderColorAndStyle.h
diff --git a/third_party/WebKit/Source/core/style/BorderColorAndStyle.h b/third_party/WebKit/Source/core/style/BorderColorAndStyle.h
new file mode 100644
index 0000000000000000000000000000000000000000..757254f2949d6acaaec1bd601640f550df861e79
--- /dev/null
+++ b/third_party/WebKit/Source/core/style/BorderColorAndStyle.h
@@ -0,0 +1,102 @@
+/*
+ * 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 BorderColorAndStyle_h
+#define BorderColorAndStyle_h
+
+#include "core/css/StyleColor.h"
+#include "core/style/ComputedStyleConstants.h"
+#include "platform/graphics/Color.h"
+#include "platform/wtf/Allocator.h"
+
+namespace blink {
+
+class BorderColorAndStyle {
+  DISALLOW_NEW();
+  friend class ComputedStyle;
+
+ public:
+  BorderColorAndStyle()
+      : color_(0),
+        color_is_current_color_(true),
+        style_(kBorderStyleNone),
+        is_auto_(kOutlineIsAutoOff) {}
+
+  bool NonZero() const { return (style_ != kBorderStyleNone); }
+
+  bool IsTransparent() const {
+    return !color_is_current_color_ && !color_.Alpha();
+  }
+
+  bool operator==(const BorderColorAndStyle& o) const {
+    return style_ == o.style_ && color_ == o.color_ &&
+           color_is_current_color_ == o.color_is_current_color_;
+  }
+
+  // The default width is 3px, but if the style is none we compute a value of 0
+  // (in ComputedStyle itself)
+  bool VisuallyEqual(const BorderColorAndStyle& o) const {
+    if (style_ == kBorderStyleNone && o.style_ == kBorderStyleNone)
+      return true;
+    if (style_ == kBorderStyleHidden && o.style_ == kBorderStyleHidden)
+      return true;
+    return *this == o;
+  }
+
+  bool operator!=(const BorderColorAndStyle& o) const { return !(*this == o); }
+
+  void SetColor(const StyleColor& color) {
+    color_ = color.Resolve(Color());
+    color_is_current_color_ = color.IsCurrentColor();
+  }
+
+  StyleColor GetColor() const {
+    return color_is_current_color_ ? StyleColor::CurrentColor()
+                                   : StyleColor(color_);
+  }
+
+  EBorderStyle Style() const { return static_cast<EBorderStyle>(style_); }
+  void SetStyle(EBorderStyle style) { style_ = style; }
+
+  OutlineIsAuto IsAuto() const { return static_cast<OutlineIsAuto>(is_auto_); }
+  void SetIsAuto(OutlineIsAuto is_auto) { is_auto_ = is_auto; }
+
+  bool ColorIsCurrentColor() const { return color_is_current_color_; }
+  void SetColorIsCurrentColor(bool color_is_current_color) {
+    color_is_current_color_ = static_cast<unsigned>(color_is_current_color);
+  }
+
+ protected:
+  Color color_;
+  unsigned color_is_current_color_ : 1;
+
+  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  // BorderColorAndStyle_h