<!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>[175540] branches/safari-600.2-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/175540">175540</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-11-04 03:42:53 -0800 (Tue, 04 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/175197">r175197</a>. <rdar://problem/18856002></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6002branchLayoutTestsChangeLog">branches/safari-600.2-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6002branchSourceWebCoreChangeLog">branches/safari-600.2-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6002branchSourceWebCorecssCSSPrimitiveValuecpp">branches/safari-600.2-branch/Source/WebCore/css/CSSPrimitiveValue.cpp</a></li>
<li><a href="#branchessafari6002branchSourceWebCorecssCSSPrimitiveValueh">branches/safari-600.2-branch/Source/WebCore/css/CSSPrimitiveValue.h</a></li>
<li><a href="#branchessafari6002branchSourceWebCorecssDeprecatedStyleBuildercpp">branches/safari-600.2-branch/Source/WebCore/css/DeprecatedStyleBuilder.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6002branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.2-branch/LayoutTests/ChangeLog (175539 => 175540)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.2-branch/LayoutTests/ChangeLog 2014-11-04 11:15:40 UTC (rev 175539)
+++ branches/safari-600.2-branch/LayoutTests/ChangeLog 2014-11-04 11:42:53 UTC (rev 175540)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-10-24 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ Clamp wordSpacing percentage value.
+ https://bugs.webkit.org/show_bug.cgi?id=129350.
+
+ Reviewed by Zalan Bujtas.
+
+ Make sure that setting the CSS style wordSpacing property to very huge percentage
+ value and blending this value with other values for animating key frames does
+ not assert or crash. The expectation is to have this huge value to be clamped to
+ the pre-defined min/max values for the CSS length type. So when blending the clamped
+ value with other wordSpacing values, the result can't be NaN. This should be very
+ similar to the case when it is set to a huge <length> value.
+
+ * css3/infinite-word-spacing-expected.txt: Added.
+ * css3/infinite-word-spacing.html: Added.
+
</ins><span class="cx"> 2014-11-04 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r175074. <rdar://problem/18856016>
</span></span></pre></div>
<a id="branchessafari6002branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.2-branch/Source/WebCore/ChangeLog (175539 => 175540)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.2-branch/Source/WebCore/ChangeLog 2014-11-04 11:15:40 UTC (rev 175539)
+++ branches/safari-600.2-branch/Source/WebCore/ChangeLog 2014-11-04 11:42:53 UTC (rev 175540)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-10-24 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ Clamp wordSpacing percentage value.
+ https://bugs.webkit.org/show_bug.cgi?id=129350.
+
+ Reviewed by Zalan Bujtas.
+
+ When the CSS wordSpacing property is percentage, its value has to be within the
+ pre-defined min/max values for the CSS length type. This is done the same way
+ the wordSpacing of type <length> is handled.
+
+ Tests: css3/infinite-word-spacing.html.
+
+ Move the definitions of minValueForCssLength and maxValueForCssLength from the
+ .cpp file to the .h file.
+ * css/CSSPrimitiveValue.cpp:
+ * css/CSSPrimitiveValue.h:
+
+ Clamp the wordSpacing value to minValueForCssLength and maxValueForCssLength when
+ its type is percentage.
+ * css/DeprecatedStyleBuilder.cpp:
+ (WebCore::ApplyPropertyWordSpacing::applyValue):
+
</ins><span class="cx"> 2014-11-04 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r175074. <rdar://problem/18856016>
</span></span></pre></div>
<a id="branchessafari6002branchSourceWebCorecssCSSPrimitiveValuecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.2-branch/Source/WebCore/css/CSSPrimitiveValue.cpp (175539 => 175540)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.2-branch/Source/WebCore/css/CSSPrimitiveValue.cpp 2014-11-04 11:15:40 UTC (rev 175539)
+++ branches/safari-600.2-branch/Source/WebCore/css/CSSPrimitiveValue.cpp 2014-11-04 11:42:53 UTC (rev 175540)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> #include "Counter.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "Font.h"
</span><del>-#include "LayoutUnit.h"
</del><span class="cx"> #include "Node.h"
</span><span class="cx"> #include "Pair.h"
</span><span class="cx"> #include "RGBColor.h"
</span><span class="lines">@@ -55,11 +54,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-// Max/min values for CSS, needs to slightly smaller/larger than the true max/min values to allow for rounding without overflowing.
-// Subtract two (rather than one) to allow for values to be converted to float and back without exceeding the LayoutUnit::max.
-const int maxValueForCssLength = INT_MAX / kFixedPointDenominator - 2;
-const int minValueForCssLength = INT_MIN / kFixedPointDenominator + 2;
-
</del><span class="cx"> static inline bool isValidCSSUnitTypeForDoubleConversion(CSSPrimitiveValue::UnitTypes unitType)
</span><span class="cx"> {
</span><span class="cx"> switch (unitType) {
</span></span></pre></div>
<a id="branchessafari6002branchSourceWebCorecssCSSPrimitiveValueh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.2-branch/Source/WebCore/css/CSSPrimitiveValue.h (175539 => 175540)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.2-branch/Source/WebCore/css/CSSPrimitiveValue.h 2014-11-04 11:15:40 UTC (rev 175539)
+++ branches/safari-600.2-branch/Source/WebCore/css/CSSPrimitiveValue.h 2014-11-04 11:42:53 UTC (rev 175540)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "CSSValue.h"
</span><span class="cx"> #include "CSSValueKeywords.h"
</span><span class="cx"> #include "Color.h"
</span><ins>+#include "LayoutUnit.h"
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="lines">@@ -46,6 +47,11 @@
</span><span class="cx"> struct Length;
</span><span class="cx"> struct LengthSize;
</span><span class="cx">
</span><ins>+// Max/min values for CSS, needs to slightly smaller/larger than the true max/min values to allow for rounding without overflowing.
+// Subtract two (rather than one) to allow for values to be converted to float and back without exceeding the LayoutUnit::max.
+const int maxValueForCssLength = intMaxForLayoutUnit - 2;
+const int minValueForCssLength = intMinForLayoutUnit + 2;
+
</ins><span class="cx"> // Dimension calculations are imprecise, often resulting in values of e.g.
</span><span class="cx"> // 44.99998. We need to go ahead and round if we're really close to the next
</span><span class="cx"> // integer value.
</span></span></pre></div>
<a id="branchessafari6002branchSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.2-branch/Source/WebCore/css/DeprecatedStyleBuilder.cpp (175539 => 175540)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.2-branch/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-11-04 11:15:40 UTC (rev 175539)
+++ branches/safari-600.2-branch/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-11-04 11:42:53 UTC (rev 175540)
</span><span class="lines">@@ -1527,7 +1527,7 @@
</span><span class="cx"> else if (primitiveValue->isLength()) {
</span><span class="cx"> wordSpacing = primitiveValue->computeLength<Length>(csstoLengthConversionDataWithTextZoomFactor(*styleResolver));
</span><span class="cx"> } else if (primitiveValue->isPercentage())
</span><del>- wordSpacing = Length(primitiveValue->getDoubleValue(), Percent);
</del><ins>+ wordSpacing = Length(clampTo<float>(primitiveValue->getDoubleValue(), minValueForCssLength, maxValueForCssLength), Percent);
</ins><span class="cx"> else if (primitiveValue->isNumber())
</span><span class="cx"> wordSpacing = Length(primitiveValue->getDoubleValue(), Fixed);
</span><span class="cx"> else
</span></span></pre>
</div>
</div>
</body>
</html>