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

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/ComputedStyleConstants.h"
 #include "platform/graphics/Color.h"
 #include "platform/wtf/Allocator.h"
 
 namespace blink {
 
 // In order to conserve memory, the border width uses fixed point,
 // which can be bitpacked.  This fixed point implementation is
 // essentially the same as in LayoutUnit.  Six bits are used for the
 // fraction, which leaves 20 bits for the integer part, making 1048575
 // the largest number.
 
 static const int kBorderWidthFractionalBits = 6;
 static const int kBorderWidthDenominator = 1 << kBorderWidthFractionalBits;
 static const int kMaxForBorderWidth = ((1 << 26) - 1) / kBorderWidthDenominator;
 
 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, const float width) {
+    SetColor(data.GetColor());
+    SetColorIsCurrentColor(ColorIsCurrentColor());
+    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();
   }
 
   bool operator==(const BorderValue& o) const {
     return width_ == o.width_ && style_ == o.style_ && color_ == o.color_ &&
            color_is_current_color_ == o.color_is_current_color_;
   }
@@ skipping 27 matching lines @@
 
   // Since precision is lost with fixed point, comparisons also have
   // to be done in fixed point.
   bool WidthEquals(float width) const {
     return WidthToFixedPoint(width) == width_;
   }
 
   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:
   static unsigned WidthToFixedPoint(float width) {
     DCHECK_GE(width, 0);
     return static_cast<unsigned>(std::min<float>(width, kMaxForBorderWidth) *
                                  kBorderWidthDenominator);
   }
 
   Color color_;
   unsigned color_is_current_color_ : 1;
 
   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