<!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>[171657] branches/safari-600.1-branch</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/171657">171657</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-07-27 11:42:58 -0700 (Sun, 27 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/171640">r171640</a>. <rdar://problem/17812921></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchLayoutTestsChangeLog">branches/safari-600.1-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreplatformgraphicsRoundedRectcpp">branches/safari-600.1-branch/Source/WebCore/platform/graphics/RoundedRect.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001branchLayoutTeststransitionsroundedrectbecomesnonrenderablewhiletransitioningexpectedtxt">branches/safari-600.1-branch/LayoutTests/transitions/rounded-rect-becomes-non-renderable-while-transitioning-expected.txt</a></li>
<li><a href="#branchessafari6001branchLayoutTeststransitionsroundedrectbecomesnonrenderablewhiletransitioninghtml">branches/safari-600.1-branch/LayoutTests/transitions/rounded-rect-becomes-non-renderable-while-transitioning.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/LayoutTests/ChangeLog (171656 => 171657)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-07-27 18:37:48 UTC (rev 171656)
+++ branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-07-27 18:42:58 UTC (rev 171657)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2014-07-27 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r171640. <rdar://problem/17812921>
+
+ 2014-07-25 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel rendering: Rounded rect gets non-renderable at certain subpixel size.
+ https://bugs.webkit.org/show_bug.cgi?id=135314
+ <rdar://problem/17812921>
+
+ Reviewed by Tim Horton.
+
+ While calculating the rounded rect for painting, the radius is adjusted to compensate
+ for the pixel snapped size. However while scaling the radius, certain values overflow
+ (float) mantissa and it produces a non-renderable rounded rect where the radius becomes bigger
+ than the rectangle dimensions. In such cases, we need to shrink the radius to make it
+ renderable again.
+
+ * transitions/rounded-rect-becomes-non-renderable-while-transitioning-expected.txt: Added.
+ * transitions/rounded-rect-becomes-non-renderable-while-transitioning.html: Added.
+
+2014-07-27 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r171624. <rdar://problem/17715503>
</span><span class="cx">
</span><span class="cx"> 2014-07-25 Jer Noble <jer.noble@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchLayoutTeststransitionsroundedrectbecomesnonrenderablewhiletransitioningexpectedtxtfromrev171640trunkLayoutTeststransitionsroundedrectbecomesnonrenderablewhiletransitioningexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/LayoutTests/transitions/rounded-rect-becomes-non-renderable-while-transitioning-expected.txt (from rev 171640, trunk/LayoutTests/transitions/rounded-rect-becomes-non-renderable-while-transitioning-expected.txt) (0 => 171657)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/transitions/rounded-rect-becomes-non-renderable-while-transitioning-expected.txt (rev 0)
+++ branches/safari-600.1-branch/LayoutTests/transitions/rounded-rect-becomes-non-renderable-while-transitioning-expected.txt 2014-07-27 18:42:58 UTC (rev 171657)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+Test passes if it does not assert in debug builds.
+
+
</ins></span></pre></div>
<a id="branchessafari6001branchLayoutTeststransitionsroundedrectbecomesnonrenderablewhiletransitioninghtmlfromrev171640trunkLayoutTeststransitionsroundedrectbecomesnonrenderablewhiletransitioninghtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/LayoutTests/transitions/rounded-rect-becomes-non-renderable-while-transitioning.html (from rev 171640, trunk/LayoutTests/transitions/rounded-rect-becomes-non-renderable-while-transitioning.html) (0 => 171657)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/transitions/rounded-rect-becomes-non-renderable-while-transitioning.html (rev 0)
+++ branches/safari-600.1-branch/LayoutTests/transitions/rounded-rect-becomes-non-renderable-while-transitioning.html 2014-07-27 18:42:58 UTC (rev 171657)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+<!DOCTYPE html>
+<head>
+<title>This tests that rounded rect stays renderable during while animating size.</title>
+<style>
+ #thumb {
+ background-color: red;
+ border: solid 1px transparent;
+ border-radius: 50%;
+ width: 100px;
+ height: 100px;
+ -webkit-transition: width 500ms, height 500ms;
+}
+</style>
+<script>
+ if (window.testRunner) {
+ window.testRunner.waitUntilDone();
+ window.testRunner.dumpAsText();
+ }
+
+ function transitionFinished() {
+ if (window.testRunner)
+ window.testRunner.notifyDone();
+ }
+
+ function start() {
+ var thumb = document.getElementById("thumb");
+ thumb.addEventListener("webkitTransitionEnd", transitionFinished, true);
+ thumb.style.width = "10px";
+ thumb.style.height = "10px";
+ }
+
+</script>
+</head>
+<body onload=start()>
+ <p>Test passes if it does not assert in debug builds.</p>
+ <div id=thumb></div>
+</body>
</ins></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (171656 => 171657)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-07-27 18:37:48 UTC (rev 171656)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-07-27 18:42:58 UTC (rev 171657)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2014-07-27 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r171640. <rdar://problem/17812921>
+
+ 2014-07-25 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel rendering: Rounded rect gets non-renderable at certain subpixel size.
+ https://bugs.webkit.org/show_bug.cgi?id=135314
+ <rdar://problem/17812921>
+
+ Reviewed by Tim Horton.
+
+ While calculating the rounded rect for painting, the radius is adjusted to compensate
+ for the pixel snapped size. However while scaling the radius, certain values overflow
+ (float) mantissa and it produces a non-renderable rounded rect where the radius becomes bigger
+ than the rectangle dimensions. In such cases, we need to shrink the radius to make it
+ renderable again.
+
+ Test: transitions/rounded-rect-becomes-non-renderable-while-transitioning.html
+
+ * platform/graphics/RoundedRect.cpp:
+ (WebCore::RoundedRect::pixelSnappedRoundedRectForPainting): shrink the radius by
+ one device pixel. It is as good as any other small value.
+
+2014-07-27 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r171624. <rdar://problem/17715503>
</span><span class="cx">
</span><span class="cx"> 2014-07-25 Jer Noble <jer.noble@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreplatformgraphicsRoundedRectcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/platform/graphics/RoundedRect.cpp (171656 => 171657)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/platform/graphics/RoundedRect.cpp 2014-07-27 18:37:48 UTC (rev 171656)
+++ branches/safari-600.1-branch/Source/WebCore/platform/graphics/RoundedRect.cpp 2014-07-27 18:42:58 UTC (rev 171657)
</span><span class="lines">@@ -249,8 +249,13 @@
</span><span class="cx">
</span><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><span class="cx"> FloatRoundedRect::Radii adjustedRadii = radii();
</span><del>- adjustedRadii.scale(pixelSnappedRect.width() / originalRect.width(), pixelSnappedRect.height() / originalRect.height());
</del><ins>+ adjustedRadii.scale(pixelSnappedRect.width() / originalRect.width().toFloat(), pixelSnappedRect.height() / originalRect.height().toFloat());
</ins><span class="cx"> FloatRoundedRect snappedRoundedRect = FloatRoundedRect(pixelSnappedRect, adjustedRadii);
</span><ins>+ if (!snappedRoundedRect.isRenderable()) {
+ // Floating point mantissa overflow can produce a non-renderable rounded rect.
+ adjustedRadii.shrink(1 / deviceScaleFactor);
+ snappedRoundedRect.setRadii(adjustedRadii);
+ }
</ins><span class="cx"> ASSERT(snappedRoundedRect.isRenderable());
</span><span class="cx"> return snappedRoundedRect;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>