Move LengthSizes border-*-radius out of BorderData

third_party/WebKit/Source/core/style/ComputedStyle.cpp

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
  *
  * 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.
@@ skipping 873 matching lines @@
   }
 
   return false;
 }
 
 bool ComputedStyle::DiffNeedsPaintInvalidationObject(
     const ComputedStyle& other) const {
   if (Visibility() != other.Visibility() ||
       PrintColorAdjust() != other.PrintColorAdjust() ||
       InsideLink() != other.InsideLink() ||
-      !Border().VisuallyEqual(other.Border()) ||
+      !Border().VisuallyEqual(other.Border()) || RadiiEqual(other) ||
       *background_data_ != *other.background_data_)
     return true;
 
   if (rare_inherited_data_.Get() != other.rare_inherited_data_.Get()) {
     if (rare_inherited_data_->user_modify !=
             other.rare_inherited_data_->user_modify ||
         rare_inherited_data_->user_select !=
             other.rare_inherited_data_->user_select ||
         rare_inherited_data_->image_rendering_ !=
             other.rare_inherited_data_->image_rendering_)
@@ skipping 480 matching lines @@
 
 void ComputedStyle::SetTextShadow(PassRefPtr<ShadowList> s) {
   rare_inherited_data_.Access()->text_shadow = std::move(s);
 }
 
 void ComputedStyle::SetBoxShadow(PassRefPtr<ShadowList> s) {
   rare_non_inherited_data_.Access()->box_shadow_ = std::move(s);
 }
 
 static FloatRoundedRect::Radii CalcRadiiFor(const BorderData& border,
+                                            const LengthSize& top_left,
+                                            const LengthSize& top_right,
+                                            const LengthSize& bottom_left,
+                                            const LengthSize& bottom_right,
                                             LayoutSize size) {
   return FloatRoundedRect::Radii(
       FloatSize(
-          FloatValueForLength(border.TopLeft().Width(), size.Width().ToFloat()),
-          FloatValueForLength(border.TopLeft().Height(),
-                              size.Height().ToFloat())),
-      FloatSize(FloatValueForLength(border.TopRight().Width(),
-                                    size.Width().ToFloat()),
-                FloatValueForLength(border.TopRight().Height(),
-                                    size.Height().ToFloat())),
-      FloatSize(FloatValueForLength(border.BottomLeft().Width(),
-                                    size.Width().ToFloat()),
-                FloatValueForLength(border.BottomLeft().Height(),
-                                    size.Height().ToFloat())),
-      FloatSize(FloatValueForLength(border.BottomRight().Width(),
-                                    size.Width().ToFloat()),
-                FloatValueForLength(border.BottomRight().Height(),
-                                    size.Height().ToFloat())));
+          FloatValueForLength(top_left.Width(), size.Width().ToFloat()),
+          FloatValueForLength(top_left.Height(), size.Height().ToFloat())),
+      FloatSize(
+          FloatValueForLength(top_right.Width(), size.Width().ToFloat()),
+          FloatValueForLength(top_right.Height(), size.Height().ToFloat())),
+      FloatSize(
+          FloatValueForLength(bottom_left.Width(), size.Width().ToFloat()),
+          FloatValueForLength(bottom_left.Height(), size.Height().ToFloat())),
+      FloatSize(
+          FloatValueForLength(bottom_right.Width(), size.Width().ToFloat()),
+          FloatValueForLength(bottom_right.Height(), size.Height().ToFloat())));
 }
 
 StyleImage* ComputedStyle::ListStyleImage() const {
   return rare_inherited_data_->list_style_image.Get();
 }
 void ComputedStyle::SetListStyleImage(StyleImage* v) {
   if (rare_inherited_data_->list_style_image != v)
     rare_inherited_data_.Access()->list_style_image = v;
 }
 
@@ skipping 22 matching lines @@
 void ComputedStyle::SetVerticalBorderSpacing(short v) {
   SET_VAR(inherited_data_, vertical_border_spacing_, v);
 }
 
 FloatRoundedRect ComputedStyle::GetRoundedBorderFor(
     const LayoutRect& border_rect,
     bool include_logical_left_edge,
     bool include_logical_right_edge) const {
   FloatRoundedRect rounded_rect(PixelSnappedIntRect(border_rect));
   if (HasBorderRadius()) {
-    FloatRoundedRect::Radii radii = CalcRadiiFor(Border(), border_rect.Size());
+    FloatRoundedRect::Radii radii =
+        CalcRadiiFor(Border(), BorderTopLeftRadius(), BorderTopRightRadius(),
+                     BorderBottomLeftRadius(), BorderBottomRightRadius(),
+                     border_rect.Size());
     rounded_rect.IncludeLogicalEdges(radii, IsHorizontalWritingMode(),
                                      include_logical_left_edge,
                                      include_logical_right_edge);
     rounded_rect.ConstrainRadii();
   }
   return rounded_rect;
 }
 
 FloatRoundedRect ComputedStyle::GetRoundedInnerBorderFor(
     const LayoutRect& border_rect,
@@ skipping 1024 matching lines @@
     if (value < 0)
       fvalue -= 0.5f;
     else
       fvalue += 0.5f;
   }
 
   return RoundForImpreciseConversion<int>(fvalue / zoom_factor);
 }
 
 }  // namespace blink