Changeset 163451 in webkit

Timestamp:

Feb 5, 2014, 9:34:59 AM (12 years ago)

Author:

zoltan@webkit.org

Message:

[CSS Shapes] Simplify BasicShapeInset::path
​https://bugs.webkit.org/show_bug.cgi?id=127920

Reviewed by David Hyatt.

I introduced a new static helper function called floatSizeForLengthSize
in order to simplify BasicShapeInset::path method.

No new tests, no behavior change.

• rendering/style/BasicShapes.cpp:

(WebCore::floatSizeForLengthSize): New helper function.
(WebCore::BasicShapeInset::path):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/style/BasicShapes.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-02-05  Zoltan Horvath  <zoltan@webkit.org>
+
+        [CSS Shapes] Simplify BasicShapeInset::path
+        https://bugs.webkit.org/show_bug.cgi?id=127920
+
+        Reviewed by David Hyatt.
+
+        I introduced a new static helper function called floatSizeForLengthSize
+        in order to simplify BasicShapeInset::path method.
+
+        No new tests, no behavior change.
+
+        * rendering/style/BasicShapes.cpp:
+        (WebCore::floatSizeForLengthSize): New helper function.
+        (WebCore::BasicShapeInset::path):
+
 2014-02-05  Wojciech Bielawski  <w.bielawski@samsung.com>
 

trunk/Source/WebCore/rendering/style/BasicShapes.cpp

@@ -345 +345 @@
 }
 
+static FloatSize floatSizeForLengthSize(const LengthSize& lengthSize, const FloatRect& boundingBox)
+{
+    return FloatSize(floatValueForLength(lengthSize.width(), boundingBox.width()),
+        floatValueForLength(lengthSize.height(), boundingBox.height()));
+}
+
 void BasicShapeInset::path(Path& path, const FloatRect& boundingBox)
 {
@@ -357 +363 @@
             std::max<float>(boundingBox.height() - top - floatValueForLength(m_bottom, boundingBox.height()), 0)
         ),
-        FloatSize(
-            floatValueForLength(m_topLeftRadius.width(), boundingBox.width()),
-            floatValueForLength(m_topLeftRadius.height(), boundingBox.height())
-        ),
-        FloatSize(
-            floatValueForLength(m_topRightRadius.width(), boundingBox.width()),
-            floatValueForLength(m_topRightRadius.height(), boundingBox.height())
-        ),
-        FloatSize(
-            floatValueForLength(m_bottomLeftRadius.width(), boundingBox.width()),
-            floatValueForLength(m_bottomLeftRadius.height(), boundingBox.height())
-        ),
-        FloatSize(
-            floatValueForLength(m_bottomRightRadius.width(), boundingBox.width()),
-            floatValueForLength(m_bottomRightRadius.height(), boundingBox.height())
-        )
+        floatSizeForLengthSize(m_topLeftRadius, boundingBox),
+        floatSizeForLengthSize(m_topRightRadius, boundingBox),
+        floatSizeForLengthSize(m_bottomLeftRadius, boundingBox),
+        floatSizeForLengthSize(m_bottomRightRadius, boundingBox)
     );
 }