Fix build after r165472

Fixes the following build failure:

    WebCore/rendering/shapes/Shape.cpp:97:20: error: unused function 'ensureRadiiDoNotOverlap' [-Werror,-Wunused-function]
    static inline void ensureRadiiDoNotOverlap(FloatRect& bounds, FloatSize& radii)
                       ^
    1 error generated.

* rendering/shapes/Shape.cpp:
(ensureRadiiDoNotOverlap): Remove unused function.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@165474 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index a145edaca48405c6cec3ce2d026ed2fb9e0fcf18..313f34efabd31fd97bd48019009a21acb5f98721 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2014-03-12  David Kilzer  <ddkilzer@apple.com>
+
+        Fix build after r165472
+
+        Fixes the following build failure:
+
+            WebCore/rendering/shapes/Shape.cpp:97:20: error: unused function 'ensureRadiiDoNotOverlap' [-Werror,-Wunused-function]
+            static inline void ensureRadiiDoNotOverlap(FloatRect& bounds, FloatSize& radii)
+                               ^
+            1 error generated.
+
+        * rendering/shapes/Shape.cpp:
+        (ensureRadiiDoNotOverlap): Remove unused function.
+
 2014-03-12  Bem Jones-Bey  <bjonesbe@adobe.com>
 
         [CSS Shapes] Remove deprecated shapes

diff --git a/Source/WebCore/rendering/shapes/Shape.cpp b/Source/WebCore/rendering/shapes/Shape.cpp
index b3424b7af693a1a42d9c0aa42f50bbd302e0434e..ab874b660814f452973f44ca95d2a21547c1050b 100644 (file)
--- a/Source/WebCore/rendering/shapes/Shape.cpp
+++ b/Source/WebCore/rendering/shapes/Shape.cpp
@@ -94,17 +94,6 @@ static inline FloatSize physicalSizeToLogical(const FloatSize& size, WritingMode
     return size.transposedSize();
 }
 
-static inline void ensureRadiiDoNotOverlap(FloatRect& bounds, FloatSize& radii)
-{
-    float widthRatio = bounds.width() / (2 * radii.width());
-    float heightRatio = bounds.height() / (2 * radii.height());
-    float reductionRatio = std::min<float>(widthRatio, heightRatio);
-    if (reductionRatio < 1) {
-        radii.setWidth(reductionRatio * radii.width());
-        radii.setHeight(reductionRatio * radii.height());
-    }
-}
-
 PassOwnPtr<Shape> Shape::createShape(const BasicShape* basicShape, const LayoutSize& logicalBoxSize, WritingMode writingMode, Length margin, Length padding)
 {
     ASSERT(basicShape);