Title: [165474] trunk/Source/WebCore
- Revision
- 165474
- Author
- [email protected]
- Date
- 2014-03-12 09:28:56 -0700 (Wed, 12 Mar 2014)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (165473 => 165474)
--- trunk/Source/WebCore/ChangeLog 2014-03-12 15:48:13 UTC (rev 165473)
+++ trunk/Source/WebCore/ChangeLog 2014-03-12 16:28:56 UTC (rev 165474)
@@ -1,3 +1,17 @@
+2014-03-12 David Kilzer <[email protected]>
+
+ 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 <[email protected]>
[CSS Shapes] Remove deprecated shapes
Modified: trunk/Source/WebCore/rendering/shapes/Shape.cpp (165473 => 165474)
--- trunk/Source/WebCore/rendering/shapes/Shape.cpp 2014-03-12 15:48:13 UTC (rev 165473)
+++ trunk/Source/WebCore/rendering/shapes/Shape.cpp 2014-03-12 16:28:56 UTC (rev 165474)
@@ -94,17 +94,6 @@
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);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
