Move LengthSizes border-*-radius out of BorderData

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 540 matching lines @@
   // border-top-color
   void SetBorderTopColor(const StyleColor& v) {
     SET_BORDERVALUE_COLOR(surround_data_, border_.top_, v);
   }
 
   // border-bottom-color
   void SetBorderBottomColor(const StyleColor& v) {
     SET_BORDERVALUE_COLOR(surround_data_, border_.bottom_, v);
   }
 
-  // Border radius properties.
-  static LengthSize InitialBorderRadius() {
-    return LengthSize(Length(0, kFixed), Length(0, kFixed));
-  }
-
-  // border-top-left-radius (aka -webkit-border-top-left-radius)
-  const LengthSize& BorderTopLeftRadius() const {
-    return surround_data_->border_.TopLeft();
-  }
-  void SetBorderTopLeftRadius(const LengthSize& s) {
-    SET_VAR(surround_data_, border_.top_left_, s);
-  }
-
-  // border-top-right-radius (aka -webkit-border-top-right-radius)
-  const LengthSize& BorderTopRightRadius() const {
-    return surround_data_->border_.TopRight();
-  }
-  void SetBorderTopRightRadius(const LengthSize& s) {
-    SET_VAR(surround_data_, border_.top_right_, s);
-  }
-
-  // border-bottom-left-radius (aka -webkit-border-bottom-left-radius)
-  const LengthSize& BorderBottomLeftRadius() const {
-    return surround_data_->border_.BottomLeft();
-  }
-  void SetBorderBottomLeftRadius(const LengthSize& s) {
-    SET_VAR(surround_data_, border_.bottom_left_, s);
-  }
-
-  // border-bottom-right-radius (aka -webkit-border-bottom-right-radius)
-  const LengthSize& BorderBottomRightRadius() const {
-    return surround_data_->border_.BottomRight();
-  }
-  void SetBorderBottomRightRadius(const LengthSize& s) {
-    SET_VAR(surround_data_, border_.bottom_right_, s);
-  }
-
   // box-shadow (aka -webkit-box-shadow)
   static ShadowList* InitialBoxShadow() { return 0; }
   ShadowList* BoxShadow() const {
     return rare_non_inherited_data_->box_shadow_.Get();
   }
   void SetBoxShadow(PassRefPtr<ShadowList>);
 
   // box-sizing (aka -webkit-box-sizing)
   static EBoxSizing InitialBoxSizing() { return EBoxSizing::kContentBox; }
   EBoxSizing BoxSizing() const {
@@ skipping 2268 matching lines @@
   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 HasBorderDecoration() const { return HasBorder() || HasBorderFill(); }
-  bool HasBorderRadius() const { return Border().HasBorderRadius(); }
+  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;
+    return false;
+  }
   bool HasBorderColorReferencingCurrentColor() const {
     return Border().HasBorderColorReferencingCurrentColor();
   }
 
+  bool RadiiEqual(const ComputedStyle& o) const {
+    return BorderTopLeftRadius() == o.BorderTopLeftRadius() &&
+           BorderTopRightRadius() == o.BorderTopRightRadius() &&
+           BorderBottomLeftRadius() == o.BorderBottomLeftRadius() &&
+           BorderBottomRightRadius() == o.BorderBottomRightRadius();
+  }
+
   void ResetBorder() {
     ResetBorderImage();
     ResetBorderTop();
     ResetBorderRight();
     ResetBorderBottom();
     ResetBorderLeft();
     ResetBorderTopLeftRadius();
     ResetBorderTopRightRadius();
     ResetBorderBottomLeftRadius();
     ResetBorderBottomRightRadius();
   }
   void ResetBorderTop() {
     SET_VAR(surround_data_, border_.top_, BorderValue());
   }
   void ResetBorderRight() {
     SET_VAR(surround_data_, border_.right_, BorderValue());
   }
   void ResetBorderBottom() {
     SET_VAR(surround_data_, border_.bottom_, BorderValue());
   }
   void ResetBorderLeft() {
     SET_VAR(surround_data_, border_.left_, BorderValue());
   }
   void ResetBorderImage() {
     SET_VAR(surround_data_, border_.image_, NinePieceImage());
   }
-  void ResetBorderTopLeftRadius() {
-    SET_VAR(surround_data_, border_.top_left_, InitialBorderRadius());
-  }
-  void ResetBorderTopRightRadius() {
-    SET_VAR(surround_data_, border_.top_right_, InitialBorderRadius());
-  }
-  void ResetBorderBottomLeftRadius() {
-    SET_VAR(surround_data_, border_.bottom_left_, InitialBorderRadius());
-  }
-  void ResetBorderBottomRightRadius() {
-    SET_VAR(surround_data_, border_.bottom_right_, InitialBorderRadius());
-  }
 
   void SetBorderRadius(const LengthSize& s) {
     SetBorderTopLeftRadius(s);
     SetBorderTopRightRadius(s);
     SetBorderBottomLeftRadius(s);
     SetBorderBottomRightRadius(s);
   }
   void SetBorderRadius(const IntSize& s) {
     SetBorderRadius(
         LengthSize(Length(s.Width(), kFixed), Length(s.Height(), kFixed)));
@@ skipping 747 matching lines @@
       PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
 }
 
 inline bool ComputedStyle::HasPseudoElementStyle() const {
   return PseudoBitsInternal() & kElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h