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

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 482 matching lines @@
 
   // border-image-outset
   const BorderImageLengthBox& BorderImageOutset() const {
     return surround_data_->border_.GetImage().Outset();
   }
   void SetBorderImageOutset(const BorderImageLengthBox&);
 
   // Border width properties.
   static float InitialBorderWidth() { return 3; }
 
-  // border-top-width
-  float BorderTopWidth() const {
-    return surround_data_->border_.BorderTopWidth();
-  }
-  void SetBorderTopWidth(float v) {
-    SET_BORDER_WIDTH(surround_data_, border_.top_, v);
-  }
-
-  // border-bottom-width
-  float BorderBottomWidth() const {
-    return surround_data_->border_.BorderBottomWidth();
-  }
-  void SetBorderBottomWidth(float v) {
-    SET_BORDER_WIDTH(surround_data_, border_.bottom_, v);
-  }
-
-  // border-left-width
-  float BorderLeftWidth() const {
-    return surround_data_->border_.BorderLeftWidth();
-  }
-  void SetBorderLeftWidth(float v) {
-    SET_BORDER_WIDTH(surround_data_, border_.left_, v);
-  }
-
-  // border-right-width
-  float BorderRightWidth() const {
-    return surround_data_->border_.BorderRightWidth();
-  }
-  void SetBorderRightWidth(float v) {
-    SET_BORDER_WIDTH(surround_data_, border_.right_, v);
-  }
-
   // Border style properties.
   static EBorderStyle InitialBorderStyle() { return kBorderStyleNone; }
 
   // border-top-style
   EBorderStyle BorderTopStyle() const {
     return surround_data_->border_.Top().Style();
   }
   void SetBorderTopStyle(EBorderStyle v) {
     SET_VAR(surround_data_, border_.top_.style_, v);
   }
@@ skipping 2301 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 surround_data_->border_.Left();
+    BorderValue* border_value =
+        new BorderValue(surround_data_->border_.Left(), BorderLeftWidth());
+    return *border_value;
   }
   const BorderValue& BorderRight() const {
-    return surround_data_->border_.Right();
+    BorderValue* border_value =
+        new BorderValue(surround_data_->border_.Right(), BorderRightWidth());
+    return *border_value;
   }
-  const BorderValue& BorderTop() const { return surround_data_->border_.Top(); }
+  const BorderValue& BorderTop() const {
+    BorderValue* border_value =
+        new BorderValue(surround_data_->border_.Top(), BorderTopWidth());
+    return *border_value;
+  }
   const BorderValue& BorderBottom() const {
-    return surround_data_->border_.Bottom();
+    BorderValue* border_value =
+        new BorderValue(surround_data_->border_.Bottom(), BorderBottomWidth());
+    return *border_value;
+  }
+  bool BorderSizeEquals(const ComputedStyle& o) const {
+    return BorderLeftWidth() == o.BorderLeftWidth() &&
+           BorderTopWidth() == o.BorderTopWidth() &&
+           BorderRightWidth() == o.BorderRightWidth() &&
+           BorderBottomWidth() == o.BorderBottomWidth();
   }
   const BorderValue& BorderBefore() const;
   const BorderValue& BorderAfter() const;
   const BorderValue& BorderStart() const;
   const BorderValue& BorderEnd() const;
   float BorderAfterWidth() const;
   float BorderBeforeWidth() const;
   float BorderEndWidth() const;
   float BorderStartWidth() const;
   float BorderOverWidth() const;
   float BorderUnderWidth() const;
 
   bool HasBorderFill() const { return Border().HasBorderFill(); }
-  bool HasBorder() const { return Border().HasBorder(); }
+  bool HasBorder() const {
+    return Border().HasBorder() || BorderLeftWidth() || BorderRightWidth() ||
+           BorderTopWidth() || BorderBottomWidth();
+  }
   bool HasBorderDecoration() const { return HasBorder() || HasBorderFill(); }
   bool HasBorderRadius() const {
     if (!BorderTopLeftRadius().Width().IsZero())
       return true;
     if (!BorderTopRightRadius().Width().IsZero())
       return true;
     if (!BorderBottomLeftRadius().Width().IsZero())
       return true;
     if (!BorderBottomRightRadius().Width().IsZero())
       return true;
@@ skipping 15 matching lines @@
     ResetBorderTop();
     ResetBorderRight();
     ResetBorderBottom();
     ResetBorderLeft();
     ResetBorderTopLeftRadius();
     ResetBorderTopRightRadius();
     ResetBorderBottomLeftRadius();
     ResetBorderBottomRightRadius();
   }
   void ResetBorderTop() {
-    SET_VAR(surround_data_, border_.top_, BorderValue());
+    SET_VAR(surround_data_, border_.top_, BorderColorAndStyle());
   }
   void ResetBorderRight() {
-    SET_VAR(surround_data_, border_.right_, BorderValue());
+    SET_VAR(surround_data_, border_.right_, BorderColorAndStyle());
   }
   void ResetBorderBottom() {
-    SET_VAR(surround_data_, border_.bottom_, BorderValue());
+    SET_VAR(surround_data_, border_.bottom_, BorderColorAndStyle());
   }
   void ResetBorderLeft() {
-    SET_VAR(surround_data_, border_.left_, BorderValue());
+    SET_VAR(surround_data_, border_.left_, BorderColorAndStyle());
   }
   void ResetBorderImage() {
     SET_VAR(surround_data_, border_.image_, NinePieceImage());
   }
 
   void SetBorderRadius(const LengthSize& s) {
     SetBorderTopLeftRadius(s);
     SetBorderTopRightRadius(s);
     SetBorderBottomLeftRadius(s);
     SetBorderBottomRightRadius(s);
@@ skipping 751 matching lines @@
       PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
 }
 
 inline bool ComputedStyle::HasPseudoElementStyle() const {
   return PseudoBitsInternal() & kElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h