<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[170458] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/170458">170458</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-06-25 19:39:10 -0700 (Wed, 25 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Assertion failed: CGPathAddRoundedRect asserts on non-renderable rounded rectangle.
https://bugs.webkit.org/show_bug.cgi?id=134288
Reviewed by Simon Fraser.
Speculative fix. This changeset attempts to address a possible mantissa overflow of radius
when checking whether the rounded rectangle is renderable.
We convert both the radius and the rectangle values to CGFloat(float/double) to perform
this renderable check, instead of always using float.
* platform/graphics/FloatRoundedRect.cpp:
(WebCore::FloatRoundedRect::Radii::scale): Move scale(float, float) from RoundedRect to FloatRoundedRect.
(WebCore::FloatRoundedRect::isRenderable): Add check if radius is >= 0.
* platform/graphics/FloatRoundedRect.h:
* platform/graphics/RoundedRect.cpp:
(WebCore::RoundedRect::Radii::scale):
(WebCore::RoundedRect::pixelSnappedRoundedRectForPainting): use FloatRoundeRect::Radii.
* platform/graphics/RoundedRect.h:
* platform/graphics/cg/PathCG.cpp:
(WebCore::Path::platformAddPathForRoundedRect): use epsilon() to ensure width/height is always >= even with mantissa overflow.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatRoundedRectcpp">trunk/Source/WebCore/platform/graphics/FloatRoundedRect.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatRoundedRecth">trunk/Source/WebCore/platform/graphics/FloatRoundedRect.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsRoundedRectcpp">trunk/Source/WebCore/platform/graphics/RoundedRect.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsRoundedRecth">trunk/Source/WebCore/platform/graphics/RoundedRect.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgPathCGcpp">trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170457 => 170458)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-26 02:10:59 UTC (rev 170457)
+++ trunk/Source/WebCore/ChangeLog 2014-06-26 02:39:10 UTC (rev 170458)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-06-25 Zalan Bujtas <zalan@apple.com>
+
+ Assertion failed: CGPathAddRoundedRect asserts on non-renderable rounded rectangle.
+ https://bugs.webkit.org/show_bug.cgi?id=134288
+
+ Reviewed by Simon Fraser.
+
+ Speculative fix. This changeset attempts to address a possible mantissa overflow of radius
+ when checking whether the rounded rectangle is renderable.
+ We convert both the radius and the rectangle values to CGFloat(float/double) to perform
+ this renderable check, instead of always using float.
+
+ * platform/graphics/FloatRoundedRect.cpp:
+ (WebCore::FloatRoundedRect::Radii::scale): Move scale(float, float) from RoundedRect to FloatRoundedRect.
+ (WebCore::FloatRoundedRect::isRenderable): Add check if radius is >= 0.
+ * platform/graphics/FloatRoundedRect.h:
+ * platform/graphics/RoundedRect.cpp:
+ (WebCore::RoundedRect::Radii::scale):
+ (WebCore::RoundedRect::pixelSnappedRoundedRectForPainting): use FloatRoundeRect::Radii.
+ * platform/graphics/RoundedRect.h:
+ * platform/graphics/cg/PathCG.cpp:
+ (WebCore::Path::platformAddPathForRoundedRect): use epsilon() to ensure width/height is always >= even with mantissa overflow.
+
</ins><span class="cx"> 2014-06-25 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [MSE] removeCodedFrames() can remove more than it should
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatRoundedRectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatRoundedRect.cpp (170457 => 170458)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatRoundedRect.cpp 2014-06-26 02:10:59 UTC (rev 170457)
+++ trunk/Source/WebCore/platform/graphics/FloatRoundedRect.cpp 2014-06-26 02:39:10 UTC (rev 170458)
</span><span class="lines">@@ -64,23 +64,27 @@
</span><span class="cx">
</span><span class="cx"> void FloatRoundedRect::Radii::scale(float factor)
</span><span class="cx"> {
</span><del>- if (factor == 1)
</del><ins>+ scale(factor, factor);
+}
+
+void FloatRoundedRect::Radii::scale(float horizontalFactor, float verticalFactor)
+{
+ if (horizontalFactor == 1 && verticalFactor == 1)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // If either radius on a corner becomes zero, reset both radii on that corner.
</span><del>- m_topLeft.scale(factor);
</del><ins>+ m_topLeft.scale(horizontalFactor, verticalFactor);
</ins><span class="cx"> if (!m_topLeft.width() || !m_topLeft.height())
</span><span class="cx"> m_topLeft = FloatSize();
</span><del>- m_topRight.scale(factor);
</del><ins>+ m_topRight.scale(horizontalFactor, verticalFactor);
</ins><span class="cx"> if (!m_topRight.width() || !m_topRight.height())
</span><span class="cx"> m_topRight = FloatSize();
</span><del>- m_bottomLeft.scale(factor);
</del><ins>+ m_bottomLeft.scale(horizontalFactor, verticalFactor);
</ins><span class="cx"> if (!m_bottomLeft.width() || !m_bottomLeft.height())
</span><span class="cx"> m_bottomLeft = FloatSize();
</span><del>- m_bottomRight.scale(factor);
</del><ins>+ m_bottomRight.scale(horizontalFactor, verticalFactor);
</ins><span class="cx"> if (!m_bottomRight.width() || !m_bottomRight.height())
</span><span class="cx"> m_bottomRight = FloatSize();
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FloatRoundedRect::Radii::expand(float topWidth, float bottomWidth, float leftWidth, float rightWidth)
</span><span class="lines">@@ -145,7 +149,11 @@
</span><span class="cx">
</span><span class="cx"> bool FloatRoundedRect::isRenderable() const
</span><span class="cx"> {
</span><del>- return m_radii.topLeft().width() + m_radii.topRight().width() <= m_rect.width()
</del><ins>+ return m_radii.topLeft().width() >= 0 && m_radii.topLeft().height() >= 0
+ && m_radii.bottomLeft().width() >= 0 && m_radii.bottomLeft().height() >= 0
+ && m_radii.topRight().width() >= 0 && m_radii.topRight().height() >= 0
+ && m_radii.bottomRight().width() >= 0 && m_radii.bottomRight().height() >= 0
+ && m_radii.topLeft().width() + m_radii.topRight().width() <= m_rect.width()
</ins><span class="cx"> && m_radii.bottomLeft().width() + m_radii.bottomRight().width() <= m_rect.width()
</span><span class="cx"> && m_radii.topLeft().height() + m_radii.bottomLeft().height() <= m_rect.height()
</span><span class="cx"> && m_radii.topRight().height() + m_radii.bottomRight().height() <= m_rect.height();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatRoundedRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatRoundedRect.h (170457 => 170458)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatRoundedRect.h 2014-06-26 02:10:59 UTC (rev 170457)
+++ trunk/Source/WebCore/platform/graphics/FloatRoundedRect.h 2014-06-26 02:39:10 UTC (rev 170458)
</span><span class="lines">@@ -69,6 +69,7 @@
</span><span class="cx"> bool isZero() const;
</span><span class="cx">
</span><span class="cx"> void scale(float factor);
</span><ins>+ void scale(float horizontalFactor, float verticalFactor);
</ins><span class="cx"> void expand(float topWidth, float bottomWidth, float leftWidth, float rightWidth);
</span><span class="cx"> void expand(float size) { expand(size, size, size, size); }
</span><span class="cx"> void shrink(float topWidth, float bottomWidth, float leftWidth, float rightWidth) { expand(-topWidth, -bottomWidth, -leftWidth, -rightWidth); }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsRoundedRectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/RoundedRect.cpp (170457 => 170458)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/RoundedRect.cpp 2014-06-26 02:10:59 UTC (rev 170457)
+++ trunk/Source/WebCore/platform/graphics/RoundedRect.cpp 2014-06-26 02:39:10 UTC (rev 170458)
</span><span class="lines">@@ -43,25 +43,20 @@
</span><span class="cx">
</span><span class="cx"> void RoundedRect::Radii::scale(float factor)
</span><span class="cx"> {
</span><del>- scale(factor, factor);
-}
-
-void RoundedRect::Radii::scale(float horizontalFactor, float verticalFactor)
-{
- if (horizontalFactor == 1 && verticalFactor == 1)
</del><ins>+ if (factor == 1)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // If either radius on a corner becomes zero, reset both radii on that corner.
</span><del>- m_topLeft.scale(horizontalFactor, verticalFactor);
</del><ins>+ m_topLeft.scale(factor);
</ins><span class="cx"> if (!m_topLeft.width() || !m_topLeft.height())
</span><span class="cx"> m_topLeft = LayoutSize();
</span><del>- m_topRight.scale(horizontalFactor, verticalFactor);
</del><ins>+ m_topRight.scale(factor);
</ins><span class="cx"> if (!m_topRight.width() || !m_topRight.height())
</span><span class="cx"> m_topRight = LayoutSize();
</span><del>- m_bottomLeft.scale(horizontalFactor, verticalFactor);
</del><ins>+ m_bottomLeft.scale(factor);
</ins><span class="cx"> if (!m_bottomLeft.width() || !m_bottomLeft.height())
</span><span class="cx"> m_bottomLeft = LayoutSize();
</span><del>- m_bottomRight.scale(horizontalFactor, verticalFactor);
</del><ins>+ m_bottomRight.scale(factor);
</ins><span class="cx"> if (!m_bottomRight.width() || !m_bottomRight.height())
</span><span class="cx"> m_bottomRight = LayoutSize();
</span><span class="cx"> }
</span><span class="lines">@@ -248,10 +243,16 @@
</span><span class="cx"> return FloatRoundedRect(originalRect, radii());
</span><span class="cx">
</span><span class="cx"> FloatRect pixelSnappedRect = pixelSnappedForPainting(originalRect, deviceScaleFactor);
</span><del>- Radii adjustedRadii = radii();
</del><ins>+
+ if (!isRenderable())
+ return FloatRoundedRect(pixelSnappedRect, radii());
+
</ins><span class="cx"> // Snapping usually does not alter size, but when it does, we need to make sure that the final rect is still renderable by distributing the size delta proportionally.
</span><ins>+ FloatRoundedRect::Radii adjustedRadii = radii();
</ins><span class="cx"> adjustedRadii.scale(pixelSnappedRect.width() / originalRect.width(), pixelSnappedRect.height() / originalRect.height());
</span><del>- return FloatRoundedRect(pixelSnappedRect, adjustedRadii);
</del><ins>+ FloatRoundedRect snappedRoundedRect = FloatRoundedRect(pixelSnappedRect, adjustedRadii);
+ ASSERT(snappedRoundedRect.isRenderable());
+ return snappedRoundedRect;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsRoundedRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/RoundedRect.h (170457 => 170458)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/RoundedRect.h 2014-06-26 02:10:59 UTC (rev 170457)
+++ trunk/Source/WebCore/platform/graphics/RoundedRect.h 2014-06-26 02:39:10 UTC (rev 170458)
</span><span class="lines">@@ -64,7 +64,6 @@
</span><span class="cx"> void excludeLogicalEdges(bool isHorizontal, bool excludeLogicalLeftEdge, bool excludeLogicalRightEdge);
</span><span class="cx">
</span><span class="cx"> void scale(float factor);
</span><del>- void scale(float horizontalFactor, float verticalFactor);
</del><span class="cx"> void expand(const LayoutUnit& topWidth, const LayoutUnit& bottomWidth, const LayoutUnit& leftWidth, const LayoutUnit& rightWidth);
</span><span class="cx"> void expand(const LayoutUnit& size) { expand(size, size, size, size); }
</span><span class="cx"> void shrink(const LayoutUnit& topWidth, const LayoutUnit& bottomWidth, const LayoutUnit& leftWidth, const LayoutUnit& rightWidth) { expand(-topWidth, -bottomWidth, -leftWidth, -rightWidth); }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgPathCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp (170457 => 170458)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp 2014-06-26 02:10:59 UTC (rev 170457)
+++ trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp 2014-06-26 02:39:10 UTC (rev 170458)
</span><span class="lines">@@ -265,7 +265,17 @@
</span><span class="cx"> bool equalHeights = (topLeftRadius.height() == bottomLeftRadius.height() && bottomLeftRadius.height() == topRightRadius.height() && topRightRadius.height() == bottomRightRadius.height());
</span><span class="cx">
</span><span class="cx"> if (equalWidths && equalHeights) {
</span><del>- wkCGPathAddRoundedRect(ensurePlatformPath(), 0, rect, topLeftRadius.width(), topLeftRadius.height());
</del><ins>+ // Ensure that CG can render the rounded rect.
+ CGFloat radiusWidth = topLeftRadius.width();
+ CGFloat radiusHeight = topLeftRadius.height();
+ CGRect rectToDraw = rect;
+ CGFloat rectWidth = CGRectGetWidth(rectToDraw);
+ CGFloat rectHeight = CGRectGetHeight(rectToDraw);
+ if (rectWidth < 2 * radiusWidth)
+ radiusWidth = rectWidth / 2 - std::numeric_limits<CGFloat>::epsilon();
+ if (rectHeight < 2 * radiusHeight)
+ radiusHeight = rectHeight / 2 - std::numeric_limits<CGFloat>::epsilon();
+ wkCGPathAddRoundedRect(ensurePlatformPath(), 0, rectToDraw, radiusWidth, radiusHeight);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>