<!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>[185595] trunk</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/185595">185595</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-16 10:58:19 -0700 (Tue, 16 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Incorrect order of arguments in initial-letter property
https://bugs.webkit.org/show_bug.cgi?id=139667
Patch by sylvain-galineau <galineau@adobe.com> on 2015-06-16
Reviewed by Sam Weinig.
Source/WebCore:
The CSS specification swapped the order of the initial-letters numeric values.
The drop cap's height now comes first, followed by its optional vertical position.
See http://www.w3.org/TR/css-inline/#sizing-drop-initials.
No new tests. Existing tests updated.
* css/CSSParser.cpp:
(WebCore::CSSParser::parseValue): swap arguments to reflect new spec order.
LayoutTests:
Update initial-letter tests to reflect the value's new ordering, per CSS Inline Layout module.
* fast/css-generated-content/initial-letter-border-padding.html:
* fast/css-generated-content/initial-letter-clearance.html:
* fast/css-generated-content/initial-letter-descender.html:
* fast/css-generated-content/initial-letter-raised.html:
* fast/css-generated-content/initial-letter-sunken.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcssgeneratedcontentinitialletterborderpaddinghtml">trunk/LayoutTests/fast/css-generated-content/initial-letter-border-padding.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgeneratedcontentinitialletterclearancehtml">trunk/LayoutTests/fast/css-generated-content/initial-letter-clearance.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgeneratedcontentinitialletterdescenderhtml">trunk/LayoutTests/fast/css-generated-content/initial-letter-descender.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgeneratedcontentinitialletterraisedhtml">trunk/LayoutTests/fast/css-generated-content/initial-letter-raised.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgeneratedcontentinitiallettersunkenhtml">trunk/LayoutTests/fast/css-generated-content/initial-letter-sunken.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185594 => 185595)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-16 17:48:47 UTC (rev 185594)
+++ trunk/LayoutTests/ChangeLog 2015-06-16 17:58:19 UTC (rev 185595)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-06-16 sylvain-galineau <galineau@adobe.com>
+
+ Incorrect order of arguments in initial-letter property
+ https://bugs.webkit.org/show_bug.cgi?id=139667
+
+ Reviewed by Sam Weinig.
+
+ Update initial-letter tests to reflect the value's new ordering, per CSS Inline Layout module.
+
+ * fast/css-generated-content/initial-letter-border-padding.html:
+ * fast/css-generated-content/initial-letter-clearance.html:
+ * fast/css-generated-content/initial-letter-descender.html:
+ * fast/css-generated-content/initial-letter-raised.html:
+ * fast/css-generated-content/initial-letter-sunken.html:
+
</ins><span class="cx"> 2015-06-16 Youenn Fablet <youenn.fablet@crf.canon.fr> and Xabier Rodriguez Calvar <calvaris@igalia.com>
</span><span class="cx">
</span><span class="cx"> [Streams API] Calling controller.error() should trigger storing an undefined error
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgeneratedcontentinitialletterborderpaddinghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-generated-content/initial-letter-border-padding.html (185594 => 185595)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-generated-content/initial-letter-border-padding.html 2015-06-16 17:48:47 UTC (rev 185594)
+++ trunk/LayoutTests/fast/css-generated-content/initial-letter-border-padding.html 2015-06-16 17:58:19 UTC (rev 185595)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> <head>
</span><span class="cx"> <style>
</span><span class="cx"> div { width:400px; margin:1em }
</span><del>-div::first-letter { color:red; border:2px solid red; padding:1px; -webkit-initial-letter: 2 3; margin-right:2px; margin-left:2px }
</del><ins>+div::first-letter { color:red; border:2px solid red; padding:1px; -webkit-initial-letter: 3 2; margin-right:2px; margin-left:2px }
</ins><span class="cx"> span.rtl { direction:rtl; display:block }
</span><span class="cx"> </style>
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgeneratedcontentinitialletterclearancehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-generated-content/initial-letter-clearance.html (185594 => 185595)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-generated-content/initial-letter-clearance.html 2015-06-16 17:48:47 UTC (rev 185594)
+++ trunk/LayoutTests/fast/css-generated-content/initial-letter-clearance.html 2015-06-16 17:58:19 UTC (rev 185595)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> <head>
</span><span class="cx"> <style>
</span><span class="cx"> div { width:400px; margin:1em }
</span><del>-div::first-letter { font-family: Zapfino; -webkit-initial-letter: 2 4; margin-right:2px; margin-left:2; }
</del><ins>+div::first-letter { font-family: Zapfino; -webkit-initial-letter: 4 2; margin-right:2px; margin-left:2; }
</ins><span class="cx">
</span><span class="cx"> </style>
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgeneratedcontentinitialletterdescenderhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-generated-content/initial-letter-descender.html (185594 => 185595)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-generated-content/initial-letter-descender.html 2015-06-16 17:48:47 UTC (rev 185594)
+++ trunk/LayoutTests/fast/css-generated-content/initial-letter-descender.html 2015-06-16 17:58:19 UTC (rev 185595)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> <head>
</span><span class="cx"> <style>
</span><span class="cx"> div { width:400px; margin:1em }
</span><del>-div::first-letter { font-family: Zapfino; -webkit-initial-letter: 2 4; margin-right:2px; margin-left:2 }
</del><ins>+div::first-letter { font-family: Zapfino; -webkit-initial-letter: 4 2; margin-right:2px; margin-left:2 }
</ins><span class="cx">
</span><span class="cx"> </style>
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgeneratedcontentinitialletterraisedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-generated-content/initial-letter-raised.html (185594 => 185595)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-generated-content/initial-letter-raised.html 2015-06-16 17:48:47 UTC (rev 185594)
+++ trunk/LayoutTests/fast/css-generated-content/initial-letter-raised.html 2015-06-16 17:58:19 UTC (rev 185595)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> <head>
</span><span class="cx"> <style>
</span><span class="cx"> div { width:400px; margin:1em }
</span><del>-div::first-letter { -webkit-initial-letter: 2 3; margin-right:2px; margin-left:2px }
</del><ins>+div::first-letter { -webkit-initial-letter: 3 2; margin-right:2px; margin-left:2px }
</ins><span class="cx"> span.rtl { direction:rtl; display:block }
</span><span class="cx"> </style>
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgeneratedcontentinitiallettersunkenhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-generated-content/initial-letter-sunken.html (185594 => 185595)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-generated-content/initial-letter-sunken.html 2015-06-16 17:48:47 UTC (rev 185594)
+++ trunk/LayoutTests/fast/css-generated-content/initial-letter-sunken.html 2015-06-16 17:58:19 UTC (rev 185595)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> <head>
</span><span class="cx"> <style>
</span><span class="cx"> div { width:400px; margin:1em }
</span><del>-div::first-letter { -webkit-initial-letter: 3 2; margin-right:2px; margin-left:2px }
</del><ins>+div::first-letter { -webkit-initial-letter: 2 3; margin-right:2px; margin-left:2px }
</ins><span class="cx"> span.rtl { direction:rtl; display:block }
</span><span class="cx"> </style>
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185594 => 185595)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-16 17:48:47 UTC (rev 185594)
+++ trunk/Source/WebCore/ChangeLog 2015-06-16 17:58:19 UTC (rev 185595)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-06-16 sylvain-galineau <galineau@adobe.com>
+
+ Incorrect order of arguments in initial-letter property
+ https://bugs.webkit.org/show_bug.cgi?id=139667
+
+ Reviewed by Sam Weinig.
+
+ The CSS specification swapped the order of the initial-letters numeric values.
+ The drop cap's height now comes first, followed by its optional vertical position.
+ See http://www.w3.org/TR/css-inline/#sizing-drop-initials.
+
+ No new tests. Existing tests updated.
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseValue): swap arguments to reflect new spec order.
+
</ins><span class="cx"> 2015-06-16 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove some unused values.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (185594 => 185595)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2015-06-16 17:48:47 UTC (rev 185594)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2015-06-16 17:58:19 UTC (rev 185595)
</span><span class="lines">@@ -2497,17 +2497,17 @@
</span><span class="cx"> validPrimitive = validateUnit(valueWithCalculation, FPositiveInteger);
</span><span class="cx"> if (!validPrimitive)
</span><span class="cx"> return false;
</span><del>- RefPtr<CSSPrimitiveValue> parsedValue1 = createPrimitiveNumericValue(valueWithCalculation);
- RefPtr<CSSPrimitiveValue> parsedValue2;
</del><ins>+ RefPtr<CSSPrimitiveValue> height = createPrimitiveNumericValue(valueWithCalculation);
+ RefPtr<CSSPrimitiveValue> position;
</ins><span class="cx"> if (num == 2) {
</span><span class="cx"> ValueWithCalculation nextValueWithCalculation(*m_valueList->next());
</span><span class="cx"> validPrimitive = validateUnit(nextValueWithCalculation, FPositiveInteger);
</span><span class="cx"> if (!validPrimitive)
</span><span class="cx"> return false;
</span><del>- parsedValue2 = createPrimitiveNumericValue(nextValueWithCalculation);
</del><ins>+ position = createPrimitiveNumericValue(nextValueWithCalculation);
</ins><span class="cx"> } else
</span><del>- parsedValue2 = parsedValue1;
- addProperty(propId, createPrimitiveValuePair(parsedValue1.release(), parsedValue2.release()), important);
</del><ins>+ position = height;
+ addProperty(propId, createPrimitiveValuePair(position.release(), height.release()), important);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>