Modified: trunk/Source/WebCore/ChangeLog (151285 => 151286)
--- trunk/Source/WebCore/ChangeLog 2013-06-06 20:29:03 UTC (rev 151285)
+++ trunk/Source/WebCore/ChangeLog 2013-06-06 20:40:50 UTC (rev 151286)
@@ -1,3 +1,20 @@
+2013-06-06 Bem Jones-Bey <[email protected]>
+
+ Fix formatting in BasicShapes.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=117309
+
+ Reviewed by Alexandru Chiculita.
+
+ I reformatted the code in BasicShapes.cpp (bug 116734) to fix the
+ style issues, and I got some of the formatting wrong, which makes the
+ code much harder to read. This patch fixes that formatting.
+
+ No new tests, formatting clean up.
+
+ * rendering/style/BasicShapes.cpp:
+ (WebCore::BasicShapeRectangle::path): Fix formatting.
+ (WebCore::BasicShapeInsetRectangle::path): Fix formatting.
+
2013-06-06 Christophe Dumez <[email protected]>
Clean up AddIncludesForType in JSC bindings generators
Modified: trunk/Source/WebCore/rendering/style/BasicShapes.cpp (151285 => 151286)
--- trunk/Source/WebCore/rendering/style/BasicShapes.cpp 2013-06-06 20:29:03 UTC (rev 151285)
+++ trunk/Source/WebCore/rendering/style/BasicShapes.cpp 2013-06-06 20:40:50 UTC (rev 151286)
@@ -54,12 +54,13 @@
void BasicShapeRectangle::path(Path& path, const FloatRect& boundingBox)
{
ASSERT(path.isEmpty());
- path.addRoundedRect(FloatRect(floatValueForLength(
- m_x,
- boundingBox.width()) + boundingBox.x(),
- floatValueForLength(m_y, boundingBox.height()) + boundingBox.y(),
- floatValueForLength(m_width, boundingBox.width()),
- floatValueForLength(m_height, boundingBox.height())),
+ path.addRoundedRect(
+ FloatRect(
+ floatValueForLength(m_x, boundingBox.width()) + boundingBox.x(),
+ floatValueForLength(m_y, boundingBox.height()) + boundingBox.y(),
+ floatValueForLength(m_width, boundingBox.width()),
+ floatValueForLength(m_height, boundingBox.height())
+ ),
FloatSize(
m_cornerRadiusX.isUndefined() ? 0 : floatValueForLength(m_cornerRadiusX, boundingBox.width()),
m_cornerRadiusY.isUndefined() ? 0 : floatValueForLength(m_cornerRadiusY, boundingBox.height())
@@ -185,11 +186,13 @@
ASSERT(path.isEmpty());
float left = floatValueForLength(m_left, boundingBox.width());
float top = floatValueForLength(m_top, boundingBox.height());
- path.addRoundedRect(FloatRect(
- left + boundingBox.x(),
- top + boundingBox.y(),
- std::max<float>(boundingBox.width() - left - floatValueForLength(m_right, boundingBox.width()), 0),
- std::max<float>(boundingBox.height() - top - floatValueForLength(m_bottom, boundingBox.height()), 0)),
+ path.addRoundedRect(
+ FloatRect(
+ left + boundingBox.x(),
+ top + boundingBox.y(),
+ std::max<float>(boundingBox.width() - left - floatValueForLength(m_right, boundingBox.width()), 0),
+ std::max<float>(boundingBox.height() - top - floatValueForLength(m_bottom, boundingBox.height()), 0)
+ ),
FloatSize(
m_cornerRadiusX.isUndefined() ? 0 : floatValueForLength(m_cornerRadiusX, boundingBox.width()),
m_cornerRadiusY.isUndefined() ? 0 : floatValueForLength(m_cornerRadiusY, boundingBox.height())
