<!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>[201875] 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/201875">201875</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2016-06-09 11:33:02 -0700 (Thu, 09 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Writing-mode-dependent properties don't apply if their value is a variable
https://bugs.webkit.org/show_bug.cgi?id=158449
<rdar://problem/26662478>
Reviewed by Simon Fraser.
Source/WebCore:
Test: fast/css/variables/direction-dependent-variable-properties.html
* css/CSSParser.cpp:
(WebCore::CSSParser::parseVariableDependentValue):
* css/CSSParser.h:
* css/StyleResolver.cpp:
(WebCore::StyleResolver::resolvedVariableValue):
CSSVariableDependentValue stores the unresolved (direction-dependent) property ID,
because the property that it resolves to cannot be determined until style resolution time.
Plumb the requisite direction and writing mode information into parseVariableDependentValue
at style resolution time so that the property can be resolved to the correct
non-direction-dependent property for each use of the value.
LayoutTests:
* fast/css/variables/direction-dependent-variable-properties-expected.html: Added.
* fast/css/variables/direction-dependent-variable-properties.html: Added.
Add a test ensuring that direction-dependent properties work correctly,
including flipping when the direction is flipped.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParserh">trunk/Source/WebCore/css/CSSParser.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssvariablesdirectiondependentvariablepropertiesexpectedhtml">trunk/LayoutTests/fast/css/variables/direction-dependent-variable-properties-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcssvariablesdirectiondependentvariablepropertieshtml">trunk/LayoutTests/fast/css/variables/direction-dependent-variable-properties.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201874 => 201875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-09 18:27:32 UTC (rev 201874)
+++ trunk/LayoutTests/ChangeLog 2016-06-09 18:33:02 UTC (rev 201875)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-06-09 Tim Horton <timothy_horton@apple.com>
+
+ Writing-mode-dependent properties don't apply if their value is a variable
+ https://bugs.webkit.org/show_bug.cgi?id=158449
+ <rdar://problem/26662478>
+
+ Reviewed by Simon Fraser.
+
+ * fast/css/variables/direction-dependent-variable-properties-expected.html: Added.
+ * fast/css/variables/direction-dependent-variable-properties.html: Added.
+ Add a test ensuring that direction-dependent properties work correctly,
+ including flipping when the direction is flipped.
+
</ins><span class="cx"> 2016-06-09 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking editing/selection/selection-in-iframe-removed-crash.html as flaky on Mac
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssvariablesdirectiondependentvariablepropertiesexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/variables/direction-dependent-variable-properties-expected.html (0 => 201875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/variables/direction-dependent-variable-properties-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/direction-dependent-variable-properties-expected.html 2016-06-09 18:33:02 UTC (rev 201875)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+<head>
+<style>
+.first {
+ padding-left: 50px;
+ padding-right: 25px;
+ height: 50px;
+ margin: 20px;
+}
+
+.second {
+ padding-left: 25px;
+ padding-right: 50px;
+ height: 50px;
+ margin: 20px;
+}
+
+.inner {
+ width: 50px;
+ height: 50px;
+ background-color: blue;
+}
+
+div {
+ display: inline-block;
+ background-color: green;
+}
+</style>
+</head>
+<body>
+ <div class="first"><div class="inner"></div></div>
+ <div class="second"><div class="inner"></div></div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssvariablesdirectiondependentvariablepropertieshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/variables/direction-dependent-variable-properties.html (0 => 201875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/variables/direction-dependent-variable-properties.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/direction-dependent-variable-properties.html 2016-06-09 18:33:02 UTC (rev 201875)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<head>
+<style>
+body {
+ --large: 50px;
+ --small: 25px;
+}
+
+.first {
+ -webkit-padding-start: var(--large);
+ -webkit-padding-end: var(--small);
+ height: 50px;
+ margin: 20px;
+}
+
+.inner {
+ width: 50px;
+ height: 50px;
+ background-color: blue;
+}
+
+div {
+ display: inline-block;
+ background-color: green;
+}
+</style>
+</head>
+<body>
+ <div class="first"><div class="inner"></div></div>
+ <span dir="rtl"><div class="first"><div class="inner"></div></div></span>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201874 => 201875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-09 18:27:32 UTC (rev 201874)
+++ trunk/Source/WebCore/ChangeLog 2016-06-09 18:33:02 UTC (rev 201875)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-06-09 Tim Horton <timothy_horton@apple.com>
+
+ Writing-mode-dependent properties don't apply if their value is a variable
+ https://bugs.webkit.org/show_bug.cgi?id=158449
+ <rdar://problem/26662478>
+
+ Reviewed by Simon Fraser.
+
+ Test: fast/css/variables/direction-dependent-variable-properties.html
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseVariableDependentValue):
+ * css/CSSParser.h:
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::resolvedVariableValue):
+ CSSVariableDependentValue stores the unresolved (direction-dependent) property ID,
+ because the property that it resolves to cannot be determined until style resolution time.
+ Plumb the requisite direction and writing mode information into parseVariableDependentValue
+ at style resolution time so that the property can be resolved to the correct
+ non-direction-dependent property for each use of the value.
+
</ins><span class="cx"> 2016-06-09 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Attempt to fix the iOS build.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (201874 => 201875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2016-06-09 18:27:32 UTC (rev 201874)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2016-06-09 18:33:02 UTC (rev 201875)
</span><span class="lines">@@ -1856,13 +1856,19 @@
</span><span class="cx"> addProperty(longhands[i], value.copyRef(), important);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<CSSValue> CSSParser::parseVariableDependentValue(CSSPropertyID propID, const CSSVariableDependentValue& dependentValue, const CustomPropertyValueMap& customProperties)
</del><ins>+RefPtr<CSSValue> CSSParser::parseVariableDependentValue(CSSPropertyID propID, const CSSVariableDependentValue& dependentValue, const CustomPropertyValueMap& customProperties, TextDirection direction, WritingMode writingMode)
</ins><span class="cx"> {
</span><span class="cx"> m_valueList.reset(new CSSParserValueList());
</span><span class="cx"> if (!dependentValue.valueList().buildParserValueListSubstitutingVariables(m_valueList.get(), customProperties))
</span><span class="cx"> return nullptr;
</span><del>- if (!parseValue(dependentValue.propertyID(), false))
</del><ins>+
+ CSSPropertyID dependentValuePropertyID = dependentValue.propertyID();
+ if (CSSProperty::isDirectionAwareProperty(dependentValuePropertyID))
+ dependentValuePropertyID = CSSProperty::resolveDirectionAwareProperty(dependentValuePropertyID, direction, writingMode);
+
+ if (!parseValue(dependentValuePropertyID, false))
</ins><span class="cx"> return nullptr;
</span><ins>+
</ins><span class="cx"> for (auto& property : m_parsedProperties) {
</span><span class="cx"> if (property.id() == propID)
</span><span class="cx"> return property.value();
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.h (201874 => 201875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.h 2016-06-09 18:27:32 UTC (rev 201874)
+++ trunk/Source/WebCore/css/CSSParser.h 2016-06-09 18:33:02 UTC (rev 201875)
</span><span class="lines">@@ -499,7 +499,7 @@
</span><span class="cx">
</span><span class="cx"> void setCustomPropertyName(const AtomicString& propertyName) { m_customPropertyName = propertyName; }
</span><span class="cx">
</span><del>- RefPtr<CSSValue> parseVariableDependentValue(CSSPropertyID, const CSSVariableDependentValue&, const CustomPropertyValueMap& customProperties);
</del><ins>+ RefPtr<CSSValue> parseVariableDependentValue(CSSPropertyID, const CSSVariableDependentValue&, const CustomPropertyValueMap& customProperties, TextDirection, WritingMode);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> bool is8BitSource() { return m_is8BitSource; }
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (201874 => 201875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2016-06-09 18:27:32 UTC (rev 201874)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2016-06-09 18:33:02 UTC (rev 201875)
</span><span class="lines">@@ -1698,7 +1698,7 @@
</span><span class="cx"> RefPtr<CSSValue> StyleResolver::resolvedVariableValue(CSSPropertyID propID, const CSSVariableDependentValue& value)
</span><span class="cx"> {
</span><span class="cx"> CSSParser parser(m_state.document());
</span><del>- return parser.parseVariableDependentValue(propID, value, m_state.style()->customProperties());
</del><ins>+ return parser.parseVariableDependentValue(propID, value, m_state.style()->customProperties(), m_state.style()->direction(), m_state.style()->writingMode());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<StyleImage> StyleResolver::styleImage(CSSPropertyID property, CSSValue& value)
</span></span></pre>
</div>
</div>
</body>
</html>