No subject
Fri Mar 7 15:32:22 PST 2014
4685">r164685</a> by <jchaffraix at chromium.org>
Source/WebCore:
Test: fast/css/parse-justify-self.html
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::propertyValue):
* css/CSSParser.cpp:
(WebCore::isValidKeywordPropertyAndValue):
(WebCore::CSSParser::parseValue):
(WebCore::isItemPositionKeyword):
(WebCore::CSSParser::parseJustifySelf):
* css/CSSParser.h:
* css/CSSPrimitiveValueMappings.h:
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
(WebCore::CSSPrimitiveValue::operator EJustifySelf):
(WebCore::CSSPrimitiveValue::operator EJustifySelfOverflowAlignment):
* css/CSSPropertyNames.in:
* css/CSSValueKeywords.in:
* css/DeprecatedStyleBuilder.cpp:
(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::applyProperty):
* rendering/style/RenderStyle.h:
* rendering/style/RenderStyleConstants.h:
* rendering/style/StyleRareNonInheritedData.cpp:
(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator=3D=3D):
* rendering/style/StyleRareNonInheritedData.h:
LayoutTests:
* fast/css/parse-justify-self-expected.txt: Added.
* fast/css/parse-justify-self.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href=3D"#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a=
></li>
<li><a href=3D"#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeL=
og</a></li>
<li><a href=3D"#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trun=
k/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href=3D"#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/c=
ss/CSSParser.cpp</a></li>
<li><a href=3D"#trunkSourceWebCorecssCSSParserh">trunk/Source/WebCore/css=
/CSSParser.h</a></li>
<li><a href=3D"#trunkSourceWebCorecssCSSPrimitiveValueMappingsh">trunk/So=
urce/WebCore/css/CSSPrimitiveValueMappings.h</a></li>
<li><a href=3D"#trunkSourceWebCorecssCSSPropertyNamesin">trunk/Source/Web=
Core/css/CSSPropertyNames.in</a></li>
<li><a href=3D"#trunkSourceWebCorecssCSSValueKeywordsin">trunk/Source/Web=
Core/css/CSSValueKeywords.in</a></li>
<li><a href=3D"#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCo=
re/css/StyleResolver.cpp</a></li>
<li><a href=3D"#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Sourc=
e/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href=3D"#trunkSourceWebCorerenderingstyleRenderStyleConstantsh">tr=
unk/Source/WebCore/rendering/style/RenderStyleConstants.h</a></li>
<li><a href=3D"#trunkSourceWebCorerenderingstyleStyleRareNonInheritedData=
cpp">trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp</=
a></li>
<li><a href=3D"#trunkSourceWebCorerenderingstyleStyleRareNonInheritedData=
h">trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h</a></=
li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href=3D"#trunkLayoutTestsfastcssparsejustifyselfexpectedtxt">trunk=
/LayoutTests/fast/css/parse-justify-self-expected.txt</a></li>
<li><a href=3D"#trunkLayoutTestsfastcssparsejustifyselfhtml">trunk/Layout=
Tests/fast/css/parse-justify-self.html</a></li>
</ul>
</div>
<div id=3D"patch">
<h3>Diff</h3>
<a id=3D"trunkLayoutTestsChangeLog"></a>
<div class=3D"modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (171009 =
=3D> 171010)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/ChangeLog 2014-07-11 19:47:40 =
UTC (rev 171009)
+++ trunk/LayoutTests/ChangeLog 2014-07-11 20:26:00 UTC (rev 171010)
</span><span class=3D"lines">@@ -1,3 +1,18 @@
</span><ins>+2014-07-11 Javier Fernandez <jfernandez at igalia.com>
+
+ [CSS Grid Layout] Implement justify-self css property
+ https://bugs.webkit.org/show_bug.cgi?id=3D134419
+
+ Reviewed by Dean Jackson.
+
+ This change adds the justify-self property from CSS 3 Box Alignm=
ent
+ and implements the parsing.
+
+ From Blink r164685 by <jchaffraix at chromium.org>
+
+ * fast/css/parse-justify-self-expected.txt: Added.
+ * fast/css/parse-justify-self.html: Added.
+
</ins><span class=3D"cx"> 2014-07-11 Brent Fulgham <bfulgham at apple.c=
om>
</span><span class=3D"cx">=20
</span><span class=3D"cx"> Use a separate backdrop element to all=
ow cues to have highlight and background color
</span></span></pre></div>
<a id=3D"trunkLayoutTestsfastcssparsejustifyselfexpectedtxt"></a>
<div class=3D"addfile"><h4>Added: trunk/LayoutTests/fast/css/parse-justif=
y-self-expected.txt (0 =3D> 171010)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css/parse-justify-self-ex=
pected.txt (rev 0)
+++ trunk/LayoutTests/fast/css/parse-justify-self-expected.txt 2014-07-11=
20:26:00 UTC (rev 171010)
</span><span class=3D"lines">@@ -0,0 +1,61 @@
</span><ins>+Test that setting and getting justify-self works as expected
+
+On success, you will see a series of "PASS" messages, followed=
by "TEST COMPLETE".
+
+
+Test getting justify-self set through CSS
+PASS getComputedStyle(justifySelfBaseline, '').getPropertyValue('-webkit=
-justify-self') is 'baseline'
+PASS getComputedStyle(justifySelfStretch, '').getPropertyValue('-webkit-=
justify-self') is 'stretch'
+PASS getComputedStyle(justifySelfStart, '').getPropertyValue('-webkit-ju=
stify-self') is 'start'
+PASS getComputedStyle(justifySelfEnd, '').getPropertyValue('-webkit-just=
ify-self') is 'end'
+PASS getComputedStyle(justifySelfCenter, '').getPropertyValue('-webkit-j=
ustify-self') is 'center'
+PASS getComputedStyle(justifySelfSelfEnd, '').getPropertyValue('-webkit-=
justify-self') is 'self-end'
+PASS getComputedStyle(justifySelfSelfStart, '').getPropertyValue('-webki=
t-justify-self') is 'self-start'
+PASS getComputedStyle(justifySelfLeft, '').getPropertyValue('-webkit-jus=
tify-self') is 'left'
+PASS getComputedStyle(justifySelfRight, '').getPropertyValue('-webkit-ju=
stify-self') is 'right'
+PASS getComputedStyle(justifySelfEndTrue, '').getPropertyValue('-webkit-=
justify-self') is 'end true'
+PASS getComputedStyle(justifySelfCenterTrue, '').getPropertyValue('-webk=
it-justify-self') is 'center true'
+PASS getComputedStyle(justifySelfSelfEndSafe, '').getPropertyValue('-web=
kit-justify-self') is 'self-end safe'
+PASS getComputedStyle(justifySelfSelfStartSafe, '').getPropertyValue('-w=
ebkit-justify-self') is 'self-start safe'
+PASS getComputedStyle(justifySelfRightSafe, '').getPropertyValue('-webki=
t-justify-self') is 'right safe'
+PASS getComputedStyle(justifySelfLeftTrue, '').getPropertyValue('-webkit=
-justify-self') is 'left true'
+
+Test initial value of justify-self through JS
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-justify-sel=
f') is 'auto'
+
+Test getting and setting justify-self through JS
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-justify-sel=
f') is 'center'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-justify-sel=
f') is 'start true'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-justify-sel=
f') is 'auto'
+
+Test bad combinaisons of justify-self
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-justify-sel=
f') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-justify-sel=
f') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-justify-sel=
f') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-justify-sel=
f') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-justify-sel=
f') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-justify-sel=
f') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-justify-sel=
f') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-justify-sel=
f') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-justify-sel=
f') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-justify-sel=
f') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-justify-sel=
f') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-justify-sel=
f') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-justify-sel=
f') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-justify-sel=
f') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-justify-sel=
f') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-justify-sel=
f') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-justify-sel=
f') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-justify-sel=
f') is 'auto'
+
+Test the value 'initial'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-justify-sel=
f') is 'center'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-justify-sel=
f') is 'auto'
+
+Test the value 'inherit'
+PASS getComputedStyle(parentElement, '').getPropertyValue('-webkit-justi=
fy-self') is 'end'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-justify-sel=
f') is 'end'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id=3D"trunkLayoutTestsfastcssparsejustifyselfhtml"></a>
<div class=3D"addfile"><h4>Added: trunk/LayoutTests/fast/css/parse-justif=
y-self.html (0 =3D> 171010)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css/parse-justify-self.ht=
ml (rev 0)
+++ trunk/LayoutTests/fast/css/parse-justify-self.html 2014-07-11 20:26:0=
0 UTC (rev 171010)
</span><span class=3D"lines">@@ -0,0 +1,232 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+#justifySelfBaseline {
+ -webkit-justify-self: baseline;
+}
+
+#justifySelfStretch {
+ -webkit-justify-self: stretch;
+}
+
+#justifySelfStart {
+ -webkit-justify-self: start;
+}
+
+#justifySelfEnd {
+ -webkit-justify-self: end;
+}
+
+#justifySelfCenter {
+ -webkit-justify-self: center;
+}
+
+#justifySelfSelfStart {
+ -webkit-justify-self: self-start;
+}
+
+#justifySelfSelfEnd {
+ -webkit-justify-self: self-end;
+}
+
+#justifySelfLeft {
+ -webkit-justify-self: left;
+}
+
+#justifySelfRight {
+ -webkit-justify-self: right;
+}
+
+#justifySelfEndTrue {
+ -webkit-justify-self: end true;
+}
+
+#justifySelfCenterTrue {
+ -webkit-justify-self: center true;
+}
+
+#justifySelfSelfEndSafe {
+ -webkit-justify-self: self-end safe;
+}
+
+#justifySelfSelfStartSafe {
+ -webkit-justify-self: self-start safe;
+}
+
+#justifySelfRightSafe {
+ -webkit-justify-self: right safe;
+}
+
+#justifySelfLeftTrue {
+ -webkit-justify-self: left true;
+}
+</style>
+<script src=3D"../../resources/js-test.js"></script&g=
t;
+</head>
+<body>
+<div id=3D"justifySelfBaseline"></div>
+<div id=3D"justifySelfStretch"></div>
+<div id=3D"justifySelfStart"></div>
+<div id=3D"justifySelfEnd"></div>
+<div id=3D"justifySelfCenter"></div>
+<div id=3D"justifySelfSelfStart"></div>
+<div id=3D"justifySelfSelfEnd"></div>
+<div id=3D"justifySelfLeft"></div>
+<div id=3D"justifySelfRight"></div>
+
+<div id=3D"justifySelfEndTrue"></div>
+<div id=3D"justifySelfCenterTrue"></div>
+<div id=3D"justifySelfSelfEndSafe"></div>
+<div id=3D"justifySelfSelfStartSafe"></div>
+<div id=3D"justifySelfRightSafe"></div>
+<div id=3D"justifySelfLeftTrue"></div>
+<script>
+description('Test that setting and getting justify-self works as expecte=
d');
+
+debug("Test getting justify-self set through CSS");
+var justifySelfBaseline =3D document.getElementById("justifySelfBas=
eline");
+shouldBe("getComputedStyle(justifySelfBaseline, '').getPropertyValu=
e('-webkit-justify-self')", "'baseline'");
+
+var justifySelfStretch =3D document.getElementById("justifySelfStre=
tch");
+shouldBe("getComputedStyle(justifySelfStretch, '').getPropertyValue=
('-webkit-justify-self')", "'stretch'");
+
+var justifySelfStart =3D document.getElementById("justifySelfStart&=
quot;);
+shouldBe("getComputedStyle(justifySelfStart, '').getPropertyValue('=
-webkit-justify-self')", "'start'");
+
+var justifySelfEnd =3D document.getElementById("justifySelfEnd"=
;);
+shouldBe("getComputedStyle(justifySelfEnd, '').getPropertyValue('-w=
ebkit-justify-self')", "'end'");
+
+var justifySelfCenter =3D document.getElementById("justifySelfCente=
r");
+shouldBe("getComputedStyle(justifySelfCenter, '').getPropertyValue(=
'-webkit-justify-self')", "'center'");
+
+var justifySelfSelfEnd =3D document.getElementById("justifySelfSelf=
End");
+shouldBe("getComputedStyle(justifySelfSelfEnd, '').getPropertyValue=
('-webkit-justify-self')", "'self-end'");
+
+var justifySelfSelfStart =3D document.getElementById("justifySelfSe=
lfStart");
+shouldBe("getComputedStyle(justifySelfSelfStart, '').getPropertyVal=
ue('-webkit-justify-self')", "'self-start'");
+
+var justifySelfLeft =3D document.getElementById("justifySelfLeft&qu=
ot;);
+shouldBe("getComputedStyle(justifySelfLeft, '').getPropertyValue('-=
webkit-justify-self')", "'left'");
+
+var justifySelfRight =3D document.getElementById("justifySelfRight&=
quot;);
+shouldBe("getComputedStyle(justifySelfRight, '').getPropertyValue('=
-webkit-justify-self')", "'right'");
+
+var justifySelfEndTrue =3D document.getElementById("justifySelfEndT=
rue");
+shouldBe("getComputedStyle(justifySelfEndTrue, '').getPropertyValue=
('-webkit-justify-self')", "'end true'");
+
+var justifySelfCenterTrue =3D document.getElementById("justifySelfC=
enterTrue");
+shouldBe("getComputedStyle(justifySelfCenterTrue, '').getPropertyVa=
lue('-webkit-justify-self')", "'center true'");
+
+var justifySelfSelfEndSafe =3D document.getElementById("justifySelf=
SelfEndSafe");
+shouldBe("getComputedStyle(justifySelfSelfEndSafe, '').getPropertyV=
alue('-webkit-justify-self')", "'self-end safe'");
+
+var justifySelfSelfStartSafe =3D document.getElementById("justifySe=
lfSelfStartSafe");
+shouldBe("getComputedStyle(justifySelfSelfStartSafe, '').getPropert=
yValue('-webkit-justify-self')", "'self-start safe'");
+
+var justifySelfRightSafe =3D document.getElementById("justifySelfRi=
ghtSafe");
+shouldBe("getComputedStyle(justifySelfRightSafe, '').getPropertyVal=
ue('-webkit-justify-self')", "'right safe'");
+
+var justifySelfLeftTrue =3D document.getElementById("justifySelfLef=
tTrue");
+shouldBe("getComputedStyle(justifySelfLeftTrue, '').getPropertyValu=
e('-webkit-justify-self')", "'left true'");
+
+debug("");
+debug("Test initial value of justify-self through JS");
+element =3D document.createElement("div");
+document.body.appendChild(element);
+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-j=
ustify-self')", "'auto'");
+
+debug("");
+debug("Test getting and setting justify-self through JS");
+element =3D document.createElement("div");
+document.body.appendChild(element);
+element.style.webkitJustifySelf =3D "center";
+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-j=
ustify-self')", "'center'");
+
+element =3D document.createElement("div");
+document.body.appendChild(element);
+element.style.webkitJustifySelf =3D "true start";
+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-j=
ustify-self')", "'start true'");
+
+element.style.webkitJustifySelf =3D "auto";
+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-j=
ustify-self')", "'auto'");
+
+debug("");
+debug("Test bad combinaisons of justify-self");
+element =3D document.createElement("div");
+document.body.appendChild(element);
+element.style.webkitJustifySelf =3D "true auto";
+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-j=
ustify-self')", "'auto'");
+
+element.style.webkitJustifySelf =3D "auto safe";
+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-j=
ustify-self')", "'auto'");
+
+element.style.webkitJustifySelf =3D "auto left";
+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-j=
ustify-self')", "'auto'");
+
+element.style.webkitJustifySelf =3D "baseline safe";
+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-j=
ustify-self')", "'auto'");
+
+element.style.webkitJustifySelf =3D "baseline center";
+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-j=
ustify-self')", "'auto'");
+
+element.style.webkitJustifySelf =3D "stretch true";
+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-j=
ustify-self')", "'auto'");
+
+element.style.webkitJustifySelf =3D "stretch right";
+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-j=
ustify-self')", "'auto'");
+
+element.style.webkitJustifySelf =3D "true true";
+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-j=
ustify-self')", "'auto'");
+
+element.style.webkitJustifySelf =3D "true safe";
+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-j=
ustify-self')", "'auto'");
+
+element.style.webkitJustifySelf =3D "center start";
+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-j=
ustify-self')", "'auto'");
+
+element.style.webkitJustifySelf =3D "stretch true";
+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-j=
ustify-self')", "'auto'");
+
+element.style.webkitJustifySelf =3D "safe stretch";
+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-j=
ustify-self')", "'auto'");
+
+element.style.webkitJustifySelf =3D "baseline safe";
+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-j=
ustify-self')", "'auto'");
+
+element.style.webkitJustifySelf =3D "true baseline";
+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-j=
ustify-self')", "'auto'");
+
+element.style.webkitJustifySelf =3D "true safe";
+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-j=
ustify-self')", "'auto'");
+
+element.style.webkitJustifySelf =3D "true safe left";
+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-j=
ustify-self')", "'auto'");
+
+element.style.webkitJustifySelf =3D "true left safe";
+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-j=
ustify-self')", "'auto'");
+
+element.style.webkitJustifySelf =3D "left safe true safe";
+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-j=
ustify-self')", "'auto'");
+
+debug("");
+debug("Test the value 'initial'");
+element.style.webkitJustifySelf =3D "center";
+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-j=
ustify-self')", "'center'");
+element.style.webkitJustifySelf =3D "initial";
+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-j=
ustify-self')", "'auto'");
+
+debug("");
+debug("Test the value 'inherit'");
+parentElement =3D document.createElement("div");
+document.body.appendChild(parentElement);
+parentElement.style.webkitJustifySelf =3D "end";
+shouldBe("getComputedStyle(parentElement, '').getPropertyValue('-we=
bkit-justify-self')", "'end'");
+
+element =3D document.createElement("div");
+parentElement.appendChild(element);
+element.style.webkitJustifySelf =3D "inherit";
+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-j=
ustify-self')", "'end'");
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id=3D"trunkSourceWebCoreChangeLog"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (1710=
09 =3D> 171010)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/ChangeLog 2014-07-11 19:47:=
40 UTC (rev 171009)
+++ trunk/Source/WebCore/ChangeLog 2014-07-11 20:26:00 UTC (rev 171010)
</span><span class=3D"lines">@@ -1,3 +1,42 @@
</span><ins>+2014-07-11 Javier Fernandez <jfernandez at igalia.com>
+
+ [CSS Grid Layout] Implement justify-self css property
+ https://bugs.webkit.org/show_bug.cgi?id=3D134419
+
+ Reviewed by Dean Jackson.
+
+ This change adds the justify-self property from CSS 3 Box Alignm=
ent
+ and implements the parsing.
+
+ From Blink r164685 by <jchaffraix at chromium.org>
+
+ Test: fast/css/parse-justify-self.html
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::propertyValue):
+ * css/CSSParser.cpp:
+ (WebCore::isValidKeywordPropertyAndValue):
+ (WebCore::CSSParser::parseValue):
+ (WebCore::isItemPositionKeyword):
+ (WebCore::CSSParser::parseJustifySelf):
+ * css/CSSParser.h:
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ (WebCore::CSSPrimitiveValue::operator EJustifySelf):
+ (WebCore::CSSPrimitiveValue::operator EJustifySelfOverflowAlignm=
ent):
+ * css/CSSPropertyNames.in:
+ * css/CSSValueKeywords.in:
+ * css/DeprecatedStyleBuilder.cpp:
+ (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::applyProperty):
+ * rendering/style/RenderStyle.h:
+ * rendering/style/RenderStyleConstants.h:
+ * rendering/style/StyleRareNonInheritedData.cpp:
+ (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+ (WebCore::StyleRareNonInheritedData::operator=3D=3D):
+ * rendering/style/StyleRareNonInheritedData.h:
+
</ins><span class=3D"cx"> 2014-07-11 Bear Travis <betravis at adobe.com=
>
</span><span class=3D"cx">=20
</span><span class=3D"cx"> [Feature Queries] Feature Query CSS Gr=
ammar Productions Should Return a Value
</span></span></pre></div>
<a id=3D"trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputed=
StyleDeclaration.cpp (171009 =3D> 171010)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclara=
tion.cpp 2014-07-11 19:47:40 UTC (rev 171009)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-07-11 2=
0:26:00 UTC (rev 171010)
</span><span class=3D"lines">@@ -283,6 +283,7 @@
</span><span class=3D"cx"> CSSPropertyWebkitFlexDirection,
</span><span class=3D"cx"> CSSPropertyWebkitFlexWrap,
</span><span class=3D"cx"> CSSPropertyWebkitJustifyContent,
</span><ins>+ CSSPropertyWebkitJustifySelf,
</ins><span class=3D"cx"> CSSPropertyWebkitFontKerning,
</span><span class=3D"cx"> CSSPropertyWebkitFontSmoothing,
</span><span class=3D"cx"> CSSPropertyWebkitFontVariantLigatures,
</span><span class=3D"lines">@@ -2006,6 +2007,13 @@
</span><span class=3D"cx"> return cssValuePool().createValue(=
style->flexWrap());
</span><span class=3D"cx"> case CSSPropertyWebkitJustifyContent:
</span><span class=3D"cx"> return cssValuePool().createValue(=
style->justifyContent());
</span><ins>+ case CSSPropertyWebkitJustifySelf: {
+ RefPtr<CSSValueList> result =3D CSSValueList::createSp=
aceSeparated();
+ result->append(CSSPrimitiveValue::create(style->justif=
ySelf()));
+ if (style->justifySelf() >=3D JustifySelfCenter &&=
amp; style->justifySelfOverflowAlignment() !=3D JustifySelfOverflowAli=
gnmentDefault)
+ result->append(CSSPrimitiveValue::create(style->ju=
stifySelfOverflowAlignment()));
+ return result.release();
+ }
</ins><span class=3D"cx"> case CSSPropertyWebkitOrder:
</span><span class=3D"cx"> return cssValuePool().createValue(=
style->order(), CSSPrimitiveValue::CSS_NUMBER);
</span><span class=3D"cx"> case CSSPropertyFloat:
</span></span></pre></div>
<a id=3D"trunkSourceWebCorecssCSSParsercpp"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.c=
pp (171009 =3D> 171010)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-07-1=
1 19:47:40 UTC (rev 171009)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-07-11 20:26:00 UTC (rev 1=
71010)
</span><span class=3D"lines">@@ -848,14 +848,17 @@
</span><span class=3D"cx"> return true;
</span><span class=3D"cx"> break;
</span><span class=3D"cx"> case CSSPropertyWebkitAlignContent:
</span><del>- if (valueID =3D=3D CSSValueFlexStart || valueID =3D=
=3D CSSValueFlexEnd || valueID =3D=3D CSSValueCenter || valueID =3D=3D CS=
SValueSpaceBetween || valueID =3D=3D CSSValueSpaceAround || valueID =3D=3D=
CSSValueStretch)
- return true;
- break;
</del><ins>+ // FIXME: Per CSS alignment, this property should acc=
ept an optional <overflow-position>. We should share this parsing c=
ode with 'justify-self'.
+ if (valueID =3D=3D CSSValueFlexStart || valueID =3D=3D CSSValueF=
lexEnd || valueID =3D=3D CSSValueCenter || valueID =3D=3D CSSValueSpaceBe=
tween || valueID =3D=3D CSSValueSpaceAround || valueID =3D=3D CSSValueStr=
etch)
+ return true;
+ break;
</ins><span class=3D"cx"> case CSSPropertyWebkitAlignItems:
</span><ins>+ // FIXME: Per CSS alignment, this property should ac=
cept the same arguments as 'justify-self' so we should share its parsing =
code.
</ins><span class=3D"cx"> if (valueID =3D=3D CSSValueFlexStart ||=
valueID =3D=3D CSSValueFlexEnd || valueID =3D=3D CSSValueCenter || value=
ID =3D=3D CSSValueBaseline || valueID =3D=3D CSSValueStretch)
</span><span class=3D"cx"> return true;
</span><span class=3D"cx"> break;
</span><span class=3D"cx"> case CSSPropertyWebkitAlignSelf:
</span><ins>+ // FIXME: Per CSS alignment, this property should ac=
cept the same arguments as 'justify-self' so we should share its parsing =
code.
</ins><span class=3D"cx"> if (valueID =3D=3D CSSValueAuto || valu=
eID =3D=3D CSSValueFlexStart || valueID =3D=3D CSSValueFlexEnd || valueID=
=3D=3D CSSValueCenter || valueID =3D=3D CSSValueBaseline || valueID =3D=3D=
CSSValueStretch)
</span><span class=3D"cx"> return true;
</span><span class=3D"cx"> break;
</span><span class=3D"lines">@@ -868,9 +871,14 @@
</span><span class=3D"cx"> return true;
</span><span class=3D"cx"> break;
</span><span class=3D"cx"> case CSSPropertyWebkitJustifyContent:
</span><ins>+ // FIXME: Per CSS alignment, this property should ac=
cept an optional <overflow-position>. We should share this parsing =
code with 'justify-self'.
</ins><span class=3D"cx"> if (valueID =3D=3D CSSValueFlexStart ||=
valueID =3D=3D CSSValueFlexEnd || valueID =3D=3D CSSValueCenter || value=
ID =3D=3D CSSValueSpaceBetween || valueID =3D=3D CSSValueSpaceAround)
</span><span class=3D"cx"> return true;
</span><span class=3D"cx"> break;
</span><ins>+ case CSSPropertyWebkitJustifySelf:
+ if (valueID =3D=3D CSSValueAuto || valueID =3D=3D CSSValueFlexSt=
art || valueID =3D=3D CSSValueFlexEnd || valueID =3D=3D CSSValueCenter ||=
valueID =3D=3D CSSValueBaseline || valueID =3D=3D CSSValueStretch)
+ return true;
+ break;
</ins><span class=3D"cx"> case CSSPropertyWebkitFontKerning:
</span><span class=3D"cx"> if (valueID =3D=3D CSSValueAuto || val=
ueID =3D=3D CSSValueNormal || valueID =3D=3D CSSValueNone)
</span><span class=3D"cx"> return true;
</span><span class=3D"lines">@@ -2566,6 +2574,8 @@
</span><span class=3D"cx"> }
</span><span class=3D"cx"> return false;
</span><span class=3D"cx"> }
</span><ins>+ case CSSPropertyWebkitJustifySelf:
+ return parseJustifySelf(propId, important);
</ins><span class=3D"cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class=3D"cx"> case CSSPropertyWebkitGridAutoColumns:
</span><span class=3D"cx"> case CSSPropertyWebkitGridAutoRows:
</span><span class=3D"lines">@@ -3069,6 +3079,63 @@
</span><span class=3D"cx"> lval =3D rval;
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><ins>+static bool isItemPositionKeyword(CSSValueID id)
+{
+ return id =3D=3D CSSValueStart || id =3D=3D CSSValueEnd || id =3D=3D=
CSSValueCenter
+ || id =3D=3D CSSValueSelfStart || id =3D=3D CSSValueSelfEnd || i=
d =3D=3D CSSValueFlexStart
+ || id =3D=3D CSSValueFlexEnd || id =3D=3D CSSValueLeft || id =3D=
=3D CSSValueRight;
+}
+
+bool CSSParser::parseJustifySelf(CSSPropertyID propId, bool important)
+{
+ // auto | baseline | stretch | [<item-position> && <=
;overflow-position>? ]
+ // <item-position> =3D center | start | end | self-start | sel=
f-end | flex-start | flex-end | left | right;
+ // <overflow-position> =3D true | safe
+
+ CSSParserValue* value =3D m_valueList->current();
+
+ if (value->id =3D=3D CSSValueAuto || value->id =3D=3D CSSValue=
Baseline || value->id =3D=3D CSSValueStretch) {
+ if (m_valueList->next())
+ return false;
+
+ addProperty(propId, cssValuePool().createIdentifierValue(value-&=
gt;id), important);
+ return true;
+ }
+
+ RefPtr<CSSPrimitiveValue> position =3D 0;
+ RefPtr<CSSPrimitiveValue> overflowAlignmentKeyword =3D 0;
+ if (isItemPositionKeyword(value->id)) {
+ position =3D cssValuePool().createIdentifierValue(value->id);
+ value =3D m_valueList->next();
+ if (value) {
+ if (value->id !=3D CSSValueTrue && value->id !=
=3D CSSValueSafe)
+ return false;
+ overflowAlignmentKeyword =3D cssValuePool().createIdentifier=
Value(value->id);
+ }
+ } else if (value->id !=3D CSSValueTrue && value->id !=3D=
CSSValueSafe)
+ return false;
+ else {
+ overflowAlignmentKeyword =3D cssValuePool().createIdentifierValu=
e(value->id);
+ value =3D m_valueList->next();
+ if (value) {
+ if (!isItemPositionKeyword(value->id))
+ return false;
+ position =3D cssValuePool().createIdentifierValue(value->=
id);
+ }
+ }
+
+ if (m_valueList->next())
+ return false;
+
+ ASSERT(position);
+ if (overflowAlignmentKeyword)
+ addProperty(propId, createPrimitiveValuePair(position.release(),=
overflowAlignmentKeyword.release()), important);
+ else
+ addProperty(propId, position.release(), important);
+
+ return true;
+}
+
</ins><span class=3D"cx"> static bool parseBackgroundClip(CSSParserValue*=
parserValue, RefPtr<CSSValue>& cssValue)
</span><span class=3D"cx"> {
</span><span class=3D"cx"> if (parserValue->id =3D=3D CSSValueBord=
erBox || parserValue->id =3D=3D CSSValuePaddingBox
</span></span></pre></div>
<a id=3D"trunkSourceWebCorecssCSSParserh"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.h=
(171009 =3D> 171010)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/css/CSSParser.h 2014-07-11 =
19:47:40 UTC (rev 171009)
+++ trunk/Source/WebCore/css/CSSParser.h 2014-07-11 20:26:00 UTC (rev 171=
010)
</span><span class=3D"lines">@@ -183,6 +183,8 @@
</span><span class=3D"cx">=20
</span><span class=3D"cx"> bool parseClipShape(CSSPropertyID, bool im=
portant);
</span><span class=3D"cx">=20
</span><ins>+ bool parseJustifySelf(CSSPropertyID, bool important);
+
</ins><span class=3D"cx"> #if ENABLE(CSS_SHAPES)
</span><span class=3D"cx"> PassRefPtr<CSSValue> parseShapePrope=
rty(CSSPropertyID);
</span><span class=3D"cx"> #endif
</span></span></pre></div>
<a id=3D"trunkSourceWebCorecssCSSPrimitiveValueMappingsh"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiv=
eValueMappings.h (171009 =3D> 171010)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/css/CSSPrimitiveValueMappin=
gs.h 2014-07-11 19:47:40 UTC (rev 171009)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2014-07-11 20:26=
:00 UTC (rev 171010)
</span><span class=3D"lines">@@ -5089,6 +5089,118 @@
</span><span class=3D"cx"> return BoxMissing;
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><ins>+template<> inline CSSPrimitiveValue::CSSPrimitiveValue=
(EJustifySelf justifySelf)
+ : CSSValue(PrimitiveClass)
+{
+ m_primitiveUnitType =3D CSS_VALUE_ID;
+ switch (justifySelf) {
+ case JustifySelfAuto:
+ m_value.valueID =3D CSSValueAuto;
+ break;
+ case JustifySelfStretch:
+ m_value.valueID =3D CSSValueStretch;
+ break;
+ case JustifySelfBaseline:
+ m_value.valueID =3D CSSValueBaseline;
+ break;
+ case JustifySelfCenter:
+ m_value.valueID =3D CSSValueCenter;
+ break;
+ case JustifySelfStart:
+ m_value.valueID =3D CSSValueStart;
+ break;
+ case JustifySelfEnd:
+ m_value.valueID =3D CSSValueEnd;
+ break;
+ case JustifySelfSelfStart:
+ m_value.valueID =3D CSSValueSelfStart;
+ break;
+ case JustifySelfSelfEnd:
+ m_value.valueID =3D CSSValueSelfEnd;
+ break;
+ case JustifySelfFlexStart:
+ m_value.valueID =3D CSSValueFlexStart;
+ break;
+ case JustifySelfFlexEnd:
+ m_value.valueID =3D CSSValueFlexEnd;
+ break;
+ case JustifySelfLeft:
+ m_value.valueID =3D CSSValueLeft;
+ break;
+ case JustifySelfRight:
+ m_value.valueID =3D CSSValueRight;
+ break;
+ default:
+ m_value.valueID =3D CSSValueAuto;
+ break;
+ }
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><ins>+template<> inline CSSPrimitiveValue::operator EJustify=
Self() const
+{
+ switch (m_value.valueID) {
+ case CSSValueAuto:
+ return JustifySelfAuto;
+ case CSSValueStretch:
+ return JustifySelfStretch;
+ case CSSValueBaseline:
+ return JustifySelfBaseline;
+ case CSSValueCenter:
+ return JustifySelfCenter;
+ case CSSValueStart:
+ return JustifySelfStart;
+ case CSSValueEnd:
+ return JustifySelfEnd;
+ case CSSValueSelfStart:
+ return JustifySelfSelfStart;
+ case CSSValueSelfEnd:
+ return JustifySelfSelfEnd;
+ case CSSValueFlexStart:
+ return JustifySelfFlexStart;
+ case CSSValueFlexEnd:
+ return JustifySelfFlexEnd;
+ case CSSValueLeft:
+ return JustifySelfLeft;
+ case CSSValueRight:
+ return JustifySelfRight;
+ default:
+ break;
+ }
+ ASSERT_NOT_REACHED();
+ return JustifySelfAuto;
+}
+
+template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EJustifySel=
fOverflowAlignment overflowAlignment)
+ : CSSValue(PrimitiveClass)
+{
+ m_primitiveUnitType =3D CSS_VALUE_ID;
+ switch (overflowAlignment) {
+ case JustifySelfOverflowAlignmentDefault:
+ m_value.valueID =3D CSSValueDefault;
+ break;
+ case JustifySelfOverflowAlignmentTrue:
+ m_value.valueID =3D CSSValueTrue;
+ break;
+ case JustifySelfOverflowAlignmentSafe:
+ m_value.valueID =3D CSSValueSafe;
+ break;
+ }
+}
+
+template<> inline CSSPrimitiveValue::operator EJustifySelfOverflow=
Alignment() const
+{
+ switch (m_value.valueID) {
+ case CSSValueTrue:
+ return JustifySelfOverflowAlignmentTrue;
+ case CSSValueSafe:
+ return JustifySelfOverflowAlignmentSafe;
+ default:
+ break;
+ }
+ ASSERT_NOT_REACHED();
+ return JustifySelfOverflowAlignmentTrue;
+}
+
+}
+
</ins><span class=3D"cx"> #endif
</span></span></pre></div>
<a id=3D"trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/css/CSSProperty=
Names.in (171009 =3D> 171010)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 201=
4-07-11 19:47:40 UTC (rev 171009)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2014-07-11 20:26:00 UTC =
(rev 171010)
</span><span class=3D"lines">@@ -303,6 +303,7 @@
</span><span class=3D"cx"> -webkit-flex-shrink
</span><span class=3D"cx"> -webkit-flex-wrap
</span><span class=3D"cx"> -webkit-justify-content
</span><ins>+-webkit-justify-self
</ins><span class=3D"cx"> -webkit-font-size-delta
</span><span class=3D"cx"> #if defined(ENABLE_CSS_GRID_LAYOUT) &&=
ENABLE_CSS_GRID_LAYOUT
</span><span class=3D"cx"> -webkit-grid
</span></span></pre></div>
<a id=3D"trunkSourceWebCorecssCSSValueKeywordsin"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueKey=
words.in (171009 =3D> 171010)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/css/CSSValueKeywords.in 201=
4-07-11 19:47:40 UTC (rev 171009)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2014-07-11 20:26:00 UTC =
(rev 171010)
</span><span class=3D"lines">@@ -544,6 +544,22 @@
</span><span class=3D"cx"> // space-between
</span><span class=3D"cx"> // space-around
</span><span class=3D"cx">=20
</span><ins>+// CSS_PROP_JUSTIFY_SELF
+// auto
+// stretch
+// baseline
+// center
+// start
+// end
+self-start
+self-end
+// flex-start
+// flex-end
+// left
+// right
+true
+safe
+
</ins><span class=3D"cx"> // CSS_PROP_FLEX_FLOW
</span><span class=3D"cx"> row
</span><span class=3D"cx"> row-reverse
</span></span></pre></div>
<a id=3D"trunkSourceWebCorecssStyleResolvercpp"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolv=
er.cpp (171009 =3D> 171010)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-=
07-11 19:47:40 UTC (rev 171009)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-07-11 20:26:00 UTC (r=
ev 171010)
</span><span class=3D"lines">@@ -2827,6 +2827,16 @@
</span><span class=3D"cx"> return;
</span><span class=3D"cx"> }
</span><span class=3D"cx"> #endif /* ENABLE(CSS_GRID_LAYOUT) */
</span><ins>+ case CSSPropertyWebkitJustifySelf: {
+ HANDLE_INHERIT_AND_INITIAL(justifySelf, JustifySelf);
+ CSSPrimitiveValue* primitiveValue =3D toCSSPrimitiveValue(value)=
;
+ if (Pair* pairValue =3D primitiveValue->getPairValue()) {
+ state.style()->setJustifySelf(*pairValue->first());
+ state.style()->setJustifySelfOverflowAlignment(*pairValue=
->second());
+ } else
+ state.style()->setJustifySelf(*primitiveValue);
+ return;
+ }
</ins><span class=3D"cx"> // These properties are aliased and Depreca=
tedStyleBuilder already applied the property on the prefixed version.
</span><span class=3D"cx"> case CSSPropertyTransitionDelay:
</span><span class=3D"cx"> case CSSPropertyTransitionDuration:
</span></span></pre></div>
<a id=3D"trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/rendering/style=
/RenderStyle.h (171009 =3D> 171010)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/rendering/style/RenderStyle=
.h 2014-07-11 19:47:40 UTC (rev 171009)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-07-11 20:26:0=
0 UTC (rev 171010)
</span><span class=3D"lines">@@ -914,6 +914,8 @@
</span><span class=3D"cx"> bool isReverseFlexDirection() const { retu=
rn flexDirection() =3D=3D FlowRowReverse || flexDirection() =3D=3D FlowCo=
lumnReverse; }
</span><span class=3D"cx"> EFlexWrap flexWrap() const { return static=
_cast<EFlexWrap>(rareNonInheritedData->m_flexibleBox->m_flexW=
rap); }
</span><span class=3D"cx"> EJustifyContent justifyContent() const { r=
eturn static_cast<EJustifyContent>(rareNonInheritedData->m_justi=
fyContent); }
</span><ins>+ EJustifySelf justifySelf() const { return static_cast<=
;EJustifySelf>(rareNonInheritedData->m_justifySelf); }
+ EJustifySelfOverflowAlignment justifySelfOverflowAlignment() const {=
return static_cast<EJustifySelfOverflowAlignment>(rareNonInherited=
Data->m_justifySelfOverflowAlignment); }
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class=3D"cx"> const Vector<GridTrackSize>& gri=
dColumns() const { return rareNonInheritedData->m_grid->m_gridColum=
ns; }
</span><span class=3D"lines">@@ -1461,6 +1463,8 @@
</span><span class=3D"cx"> void setFlexDirection(EFlexDirection direc=
tion) { SET_VAR(rareNonInheritedData.access()->m_flexibleBox, m_flexDi=
rection, direction); }
</span><span class=3D"cx"> void setFlexWrap(EFlexWrap w) { SET_VAR(ra=
reNonInheritedData.access()->m_flexibleBox, m_flexWrap, w); }
</span><span class=3D"cx"> void setJustifyContent(EJustifyContent p) =
{ SET_VAR(rareNonInheritedData, m_justifyContent, p); }
</span><ins>+ void setJustifySelf(EJustifySelf p) { SET_VAR(rareNonInh=
eritedData, m_justifySelf, p); }
+ void setJustifySelfOverflowAlignment(EJustifySelfOverflowAlignment o=
verflowAlignment) { SET_VAR(rareNonInheritedData, m_justifySelfOverflowAl=
ignment, overflowAlignment); }
</ins><span class=3D"cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class=3D"cx"> void setGridAutoColumns(const GridTrackSiz=
e& length) { SET_VAR(rareNonInheritedData.access()->m_grid, m_grid=
AutoColumns, length); }
</span><span class=3D"cx"> void setGridAutoRows(const GridTrackSize&a=
mp; length) { SET_VAR(rareNonInheritedData.access()->m_grid, m_gridAut=
oRows, length); }
</span><span class=3D"lines">@@ -1825,6 +1829,8 @@
</span><span class=3D"cx"> static EFlexDirection initialFlexDirection=
() { return FlowRow; }
</span><span class=3D"cx"> static EFlexWrap initialFlexWrap() { retur=
n FlexNoWrap; }
</span><span class=3D"cx"> static EJustifyContent initialJustifyConte=
nt() { return JustifyFlexStart; }
</span><ins>+ static EJustifySelf initialJustifySelf() { return Justif=
ySelfAuto; }
+ static EJustifySelfOverflowAlignment initialJustifySelfOverflowAlign=
ment() { return JustifySelfOverflowAlignmentDefault; }
</ins><span class=3D"cx"> static int initialMarqueeLoopCount() { retu=
rn -1; }
</span><span class=3D"cx"> static int initialMarqueeSpeed() { return =
85; }
</span><span class=3D"cx"> static Length initialMarqueeIncrement() { =
return Length(6, Fixed); }
</span></span></pre></div>
<a id=3D"trunkSourceWebCorerenderingstyleRenderStyleConstantsh"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/rendering/style=
/RenderStyleConstants.h (171009 =3D> 171010)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/rendering/style/RenderStyle=
Constants.h 2014-07-11 19:47:40 UTC (rev 171009)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2014-07-1=
1 20:26:00 UTC (rev 171010)
</span><span class=3D"lines">@@ -184,7 +184,10 @@
</span><span class=3D"cx"> enum EFlexDirection { FlowRow, FlowRowReverse,=
FlowColumn, FlowColumnReverse };
</span><span class=3D"cx"> enum EFlexWrap { FlexNoWrap, FlexWrap, FlexWra=
pReverse };
</span><span class=3D"cx"> enum EJustifyContent { JustifyFlexStart, Justi=
fyFlexEnd, JustifyCenter, JustifySpaceBetween, JustifySpaceAround };
</span><ins>+enum EJustifySelf {JustifySelfAuto, JustifySelfStretch, Just=
ifySelfBaseline, JustifySelfCenter, JustifySelfStart, JustifySelfEnd, Jus=
tifySelfSelfStart, JustifySelfSelfEnd, JustifySelfFlexStart, JustifySelfF=
lexEnd, JustifySelfLeft, JustifySelfRight};
+enum EJustifySelfOverflowAlignment {JustifySelfOverflowAlignmentDefault,=
JustifySelfOverflowAlignmentTrue, JustifySelfOverflowAlignmentSafe};
</ins><span class=3D"cx">=20
</span><ins>+
</ins><span class=3D"cx"> enum ETextSecurity {
</span><span class=3D"cx"> TSNONE, TSDISC, TSCIRCLE, TSSQUARE
</span><span class=3D"cx"> };
</span></span></pre></div>
<a id=3D"trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp"></=
a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/rendering/style=
/StyleRareNonInheritedData.cpp (171009 =3D> 171010)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/rendering/style/StyleRareNo=
nInheritedData.cpp 2014-07-11 19:47:40 UTC (rev 171009)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 20=
14-07-11 20:26:00 UTC (rev 171010)
</span><span class=3D"lines">@@ -76,6 +76,8 @@
</span><span class=3D"cx"> , m_alignItems(RenderStyle::initialAlignIt=
ems())
</span><span class=3D"cx"> , m_alignSelf(RenderStyle::initialAlignSel=
f())
</span><span class=3D"cx"> , m_justifyContent(RenderStyle::initialJus=
tifyContent())
</span><ins>+ , m_justifySelf(RenderStyle::initialJustifySelf())
+ , m_justifySelfOverflowAlignment(RenderStyle::initialJustifySelfOver=
flowAlignment())
</ins><span class=3D"cx"> , userDrag(RenderStyle::initialUserDrag())
</span><span class=3D"cx"> , textOverflow(RenderStyle::initialTextOve=
rflow())
</span><span class=3D"cx"> , marginBeforeCollapse(MCOLLAPSE)
</span><span class=3D"lines">@@ -153,6 +155,8 @@
</span><span class=3D"cx"> , m_alignItems(o.m_alignItems)
</span><span class=3D"cx"> , m_alignSelf(o.m_alignSelf)
</span><span class=3D"cx"> , m_justifyContent(o.m_justifyContent)
</span><ins>+ , m_justifySelf(o.m_justifySelf)
+ , m_justifySelfOverflowAlignment(o.m_justifySelfOverflowAlignment)
</ins><span class=3D"cx"> , userDrag(o.userDrag)
</span><span class=3D"cx"> , textOverflow(o.textOverflow)
</span><span class=3D"cx"> , marginBeforeCollapse(o.marginBeforeColla=
pse)
</span><span class=3D"lines">@@ -255,7 +259,9 @@
</span><span class=3D"cx"> && m_isolation =3D=3D o.m_isol=
ation
</span><span class=3D"cx"> #endif
</span><span class=3D"cx"> && m_aspectRatioType =3D=3D o.=
m_aspectRatioType
</span><del>- && m_objectFit =3D=3D o.m_objectFit;
</del><ins>+ && m_objectFit =3D=3D o.m_objectFit
+ && m_justifySelf =3D=3D o.m_justifySelf
+ && m_justifySelfOverflowAlignment =3D=3D o.m_justifySelf=
OverflowAlignment;
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> bool StyleRareNonInheritedData::contentDataEqu=
ivalent(const StyleRareNonInheritedData& o) const
</span></span></pre></div>
<a id=3D"trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatah"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/rendering/style=
/StyleRareNonInheritedData.h (171009 =3D> 171010)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/rendering/style/StyleRareNo=
nInheritedData.h 2014-07-11 19:47:40 UTC (rev 171009)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2014=
-07-11 20:26:00 UTC (rev 171010)
</span><span class=3D"lines">@@ -176,6 +176,9 @@
</span><span class=3D"cx"> unsigned m_alignSelf : 3; // EAlignItems
</span><span class=3D"cx"> unsigned m_justifyContent : 3; // EJustify=
Content
</span><span class=3D"cx">=20
</span><ins>+ unsigned m_justifySelf : 4; // EJustifySelf
+ unsigned m_justifySelfOverflowAlignment : 2; // EJustifySelfOverflow=
Alignment
+
</ins><span class=3D"cx"> unsigned userDrag : 2; // EUserDrag
</span><span class=3D"cx"> unsigned textOverflow : 1; // Whether or n=
ot lines that spill out should be truncated with "..."
</span><span class=3D"cx"> unsigned marginBeforeCollapse : 2; // EMar=
ginCollapse
</span></span></pre>
</div>
</div>
</body>
</html>
More information about the webkit-changes
mailing list