[CSS Shapes] Normalize distances to closest/farthest side

Source/core/layout/style/BasicShapes.cpp

 /*
  * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above
  *    copyright notice, this list of conditions and the following
  *    disclaimer.
@@ skipping 62 matching lines @@
     return m_centerX == other.m_centerX && m_centerY == other.m_centerY && m_radius == other.m_radius;
 }
 
 float BasicShapeCircle::floatValueForRadiusInBox(FloatSize boxSize) const
 {
     if (m_radius.type() == BasicShapeRadius::Value)
         return floatValueForLength(m_radius.value(), hypotf(boxSize.width(), boxSize.height()) / sqrtf(2));
 
     FloatPoint center = floatPointForCenterCoordinate(m_centerX, m_centerY, boxSize);
 
+    float radiusX, radiusY;

[Bem Jones-Bey (adobe), 2015/02/19 18:41:06]

This naming confused me. What we have here is not the radius, but it's the
distance between the side of the reference box and the center of the circle.

Maybe call it widthDelta and heightDelta? (Unless you have a better name)

+    if (center.x() < boxSize.width())
+        radiusX = boxSize.width() - center.x();
+    else
+        radiusX = center.x() - boxSize.width();
+    if (center.y() < boxSize.height())
+        radiusY = boxSize.height() - center.y();
+    else
+        radiusY = center.y() - boxSize.height();
     if (m_radius.type() == BasicShapeRadius::ClosestSide)
-        return std::min(std::min(center.x(), boxSize.width() - center.x()), std::min(center.y(), boxSize.height() - center.y()));
+        return std::min(std::min(std::abs(center.x()), radiusX), std::min(std::abs(center.y()), radiusY));
 
     // If radius.type() == BasicShapeRadius::FarthestSide.
-    return std::max(std::max(center.x(), boxSize.width() - center.x()), std::max(center.y(), boxSize.height() - center.y()));
+    return std::max(std::max(center.x(), radiusX), std::max(center.y(), radiusY));
 }
 
 void BasicShapeCircle::path(Path& path, const FloatRect& boundingBox)
 {
     ASSERT(path.isEmpty());
     FloatPoint center = floatPointForCenterCoordinate(m_centerX, m_centerY, boundingBox.size());
     float radius = floatValueForRadiusInBox(boundingBox.size());
     path.addEllipse(FloatRect(
         center.x() - radius + boundingBox.x(),
         center.y() - radius + boundingBox.y(),
@@ skipping 21 matching lines @@
     const BasicShapeEllipse& other = toBasicShapeEllipse(o);
     return m_centerX == other.m_centerX && m_centerY == other.m_centerY && m_radiusX == other.m_radiusX && m_radiusY == other.m_radiusY;
 }
 
 float BasicShapeEllipse::floatValueForRadiusInBox(const BasicShapeRadius& radius, float center, float boxWidthOrHeight) const
 {
     if (radius.type() == BasicShapeRadius::Value)
         return floatValueForLength(radius.value(), boxWidthOrHeight);
 
     if (radius.type() == BasicShapeRadius::ClosestSide)
-        return std::min(center, boxWidthOrHeight - center);
+        return std::min(std::abs(center), boxWidthOrHeight > center ? boxWidthOrHeight - center : center - boxWidthOrHeight);
 
     ASSERT(radius.type() == BasicShapeRadius::FarthestSide);
-    return std::max(center, boxWidthOrHeight - center);
+    return std::max(center, boxWidthOrHeight > center ? boxWidthOrHeight - center : center - boxWidthOrHeight);
 }
 
 void BasicShapeEllipse::path(Path& path, const FloatRect& boundingBox)
 {
     ASSERT(path.isEmpty());
     FloatPoint center = floatPointForCenterCoordinate(m_centerX, m_centerY, boundingBox.size());
     float radiusX = floatValueForRadiusInBox(m_radiusX, center.x(), boundingBox.width());
     float radiusY = floatValueForRadiusInBox(m_radiusY, center.y(), boundingBox.height());
     path.addEllipse(FloatRect(
         center.x() - radiusX + boundingBox.x(),
@@ skipping 132 matching lines @@
         && m_top == other.m_top
         && m_bottom == other.m_bottom
         && m_left == other.m_left
         && m_topLeftRadius == other.m_topLeftRadius
         && m_topRightRadius == other.m_topRightRadius
         && m_bottomRightRadius == other.m_bottomRightRadius
         && m_bottomLeftRadius == other.m_bottomLeftRadius;
 }
 
 }