Diff
Modified: trunk/LayoutTests/ChangeLog (209459 => 209460)
--- trunk/LayoutTests/ChangeLog 2016-12-07 16:48:03 UTC (rev 209459)
+++ trunk/LayoutTests/ChangeLog 2016-12-07 17:18:45 UTC (rev 209460)
@@ -1,3 +1,28 @@
+2016-12-07 Dave Hyatt <hy...@apple.com>
+
+ [CSS Parser] Turn back on a bunch of layout tests
+ https://bugs.webkit.org/show_bug.cgi?id=165529
+
+ Reviewed by Zalan Bujtas.
+
+ * TestExpectations:
+ * css3/parsing-css3-nthchild-expected.txt:
+ * css3/parsing-css3-nthchild.html:
+ * css3/scroll-snap/scroll-snap-position-values-expected.txt:
+ * css3/scroll-snap/scroll-snap-position-values.html:
+ * editing/execCommand/insert-list-with-noneditable-content-expected.txt:
+ * fast/css/object-position/parsing-object-position-expected.txt:
+ * fast/css/object-position/parsing-object-position.html:
+ * fast/css/parsing-css-number-types-expected.txt:
+ * fast/css/parsing-css-wrap-expected.txt:
+ * fast/css/script-tests/transform-origin-parsing.js:
+ * fast/css/transform-inline-style-remove-expected.txt:
+ * fast/css/transform-origin-parsing-expected.txt:
+ * fast/css/variables/custom-property-dynamic-update-expected.html:
+ * fast/events/mouse-cursor-expected.txt:
+ * fast/inspector-support/style-expected.txt:
+ * platform/mac/svg/webarchive/svg-script-subresouces-expected.txt:
+
2016-12-07 Ryan Haddad <ryanhad...@apple.com>
Rebaseline fast/table/003.html after r209421.
Modified: trunk/LayoutTests/TestExpectations (209459 => 209460)
--- trunk/LayoutTests/TestExpectations 2016-12-07 16:48:03 UTC (rev 209459)
+++ trunk/LayoutTests/TestExpectations 2016-12-07 17:18:45 UTC (rev 209460)
@@ -993,25 +993,6 @@
webkit.org/b/164797 js/dom/domjit-function-get-element-by-id-licm.html [ Pass Timeout ]
webkit.org/b/164797 js/dom/domjit-function-get-element-by-id-changed.html [ Pass Timeout ]
-# The following layout tests are allowed to fail temporarily until we get the new CSS parser
-# enabled. Once it is turned on, all of these tests should have their results reset.
-webkit.org/b/165195 css3/parsing-css3-nthchild.html [ Pass Failure ]
-webkit.org/b/165195 css3/scroll-snap/scroll-snap-position-values.html [ Pass Failure ]
-webkit.org/b/165195 css3/scroll-snap/scroll-snap-position-values.html [ Pass Failure ]
-webkit.org/b/165195 editing/execCommand/insert-list-with-noneditable-content.html [ Pass Failure ]
-webkit.org/b/165195 fast/css/object-position/parsing-object-position.html [ Pass Failure ]
-webkit.org/b/165195 fast/css/large-value-csstext.html [ Pass Failure ]
-webkit.org/b/165195 fast/css/parsing-css-number-types.html [ Pass Failure ]
-webkit.org/b/165195 fast/css/parsing-css-wrap.html [ Pass Failure ]
-webkit.org/b/165195 fast/css/transform-origin-parsing.html [ Pass Failure ]
-webkit.org/b/165195 fast/css/transform-inline-style-remove.html [ Pass Failure ]
-webkit.org/b/165195 fast/css/variables/custom-property-dynamic-update.html [ Skip ]
-webkit.org/b/165195 fast/events/mouse-cursor.html [ Pass Failure ]
-webkit.org/b/165195 fast/forms/basic-selects.html [ Pass Failure ]
-webkit.org/b/165195 fast/shadow-dom/slotted-pseudo-element-css-text.html [ Pass Failure ]
-webkit.org/b/165195 fast/inspector-support/style.html [ Pass Failure ]
-webkit.org/b/165195 svg/webarchive/svg-script-subresouces.svg [ Pass Failure ]
-
# The following layout tests need to be changed when the new CSS Parser is turned on, since they
# incorrectly indicate failures on valid syntax.
webkit.org/b/165195 css3/font-variant-parsing.html [ Pass Failure ]
Modified: trunk/LayoutTests/css3/parsing-css3-nthchild-expected.txt (209459 => 209460)
--- trunk/LayoutTests/css3/parsing-css3-nthchild-expected.txt 2016-12-07 16:48:03 UTC (rev 209459)
+++ trunk/LayoutTests/css3/parsing-css3-nthchild-expected.txt 2016-12-07 17:18:45 UTC (rev 209460)
@@ -6,10 +6,8 @@
#b:nth-child(n- 10) { color: green; }
#g:nth-child(-n-1) { color: green; }
#h:nth-child(-n- 10) { color: green; }
-#n:nth-child(-n
- - 1) { color: green; }
-#o:nth-child(-n
- +13) { color: green; }
+#n:nth-child(-n - 1) { color: green; }
+#o:nth-child(-n +13) { color: green; }
Expected result:
#a:nth-child(n-1) { color: green; }
@@ -16,8 +14,6 @@
#b:nth-child(n- 10) { color: green; }
#g:nth-child(-n-1) { color: green; }
#h:nth-child(-n- 10) { color: green; }
-#n:nth-child(-n
- - 1) { color: green; }
-#o:nth-child(-n
- +13) { color: green; }
+#n:nth-child(-n - 1) { color: green; }
+#o:nth-child(-n +13) { color: green; }
Modified: trunk/LayoutTests/css3/parsing-css3-nthchild.html (209459 => 209460)
--- trunk/LayoutTests/css3/parsing-css3-nthchild.html 2016-12-07 16:48:03 UTC (rev 209459)
+++ trunk/LayoutTests/css3/parsing-css3-nthchild.html 2016-12-07 17:18:45 UTC (rev 209460)
@@ -56,9 +56,7 @@
#b:nth-child(n- 10) { color: green; }
#g:nth-child(-n-1) { color: green; }
#h:nth-child(-n- 10) { color: green; }
-#n:nth-child(-n
- - 1) { color: green; }
-#o:nth-child(-n
- +13) { color: green; }
+#n:nth-child(-n - 1) { color: green; }
+#o:nth-child(-n +13) { color: green; }
</pre>
</body>
Modified: trunk/LayoutTests/css3/scroll-snap/scroll-snap-position-values-expected.txt (209459 => 209460)
--- trunk/LayoutTests/css3/scroll-snap/scroll-snap-position-values-expected.txt 2016-12-07 16:48:03 UTC (rev 209459)
+++ trunk/LayoutTests/css3/scroll-snap/scroll-snap-position-values-expected.txt 2016-12-07 17:18:45 UTC (rev 209460)
@@ -51,7 +51,7 @@
PASS window.getComputedStyle(initialDestination).getPropertyValue('-webkit-scroll-snap-points-y') is "repeat(100%)"
PASS initialDestination.style['-webkit-scroll-snap-destination'] is "initial"
PASS window.getComputedStyle(initialDestination).getPropertyValue('-webkit-scroll-snap-destination') is "0px 0px"
-PASS initialDestination.style['-webkit-scroll-snap-coordinate'] is ""
+PASS initialDestination.style['-webkit-scroll-snap-coordinate'] is "none"
PASS window.getComputedStyle(initialDestination).getPropertyValue('-webkit-scroll-snap-coordinate') is "none"
PASS initialSnapCoordinate.style['-webkit-scroll-snap-type'] is ""
PASS window.getComputedStyle(initialSnapCoordinate).getPropertyValue('-webkit-scroll-snap-type') is "mandatory"
@@ -81,7 +81,7 @@
PASS window.getComputedStyle(noneSnapCoordinateAndDestination).getPropertyValue('-webkit-scroll-snap-points-y') is "repeat(100%)"
PASS noneSnapCoordinateAndDestination.style['-webkit-scroll-snap-destination'] is ""
PASS window.getComputedStyle(noneSnapCoordinateAndDestination).getPropertyValue('-webkit-scroll-snap-destination') is "0px 0px"
-PASS noneSnapCoordinateAndDestination.style['-webkit-scroll-snap-coordinate'] is ""
+PASS noneSnapCoordinateAndDestination.style['-webkit-scroll-snap-coordinate'] is "none"
PASS window.getComputedStyle(noneSnapCoordinateAndDestination).getPropertyValue('-webkit-scroll-snap-coordinate') is "none"
PASS calculatedCoordinateAndDestination.style['-webkit-scroll-snap-type'] is ""
PASS window.getComputedStyle(calculatedCoordinateAndDestination).getPropertyValue('-webkit-scroll-snap-type') is "mandatory"
Modified: trunk/LayoutTests/css3/scroll-snap/scroll-snap-position-values.html (209459 => 209460)
--- trunk/LayoutTests/css3/scroll-snap/scroll-snap-position-values.html 2016-12-07 16:48:03 UTC (rev 209459)
+++ trunk/LayoutTests/css3/scroll-snap/scroll-snap-position-values.html 2016-12-07 17:18:45 UTC (rev 209460)
@@ -253,7 +253,7 @@
shouldBeEqualToString("window.getComputedStyle(initialDestination).getPropertyValue('-webkit-scroll-snap-points-y')", "repeat(100%)");
shouldBeEqualToString("initialDestination.style['-webkit-scroll-snap-destination']", "initial");
shouldBeEqualToString("window.getComputedStyle(initialDestination).getPropertyValue('-webkit-scroll-snap-destination')", "0px 0px");
- shouldBeEmptyString("initialDestination.style['-webkit-scroll-snap-coordinate']");
+ shouldBeEqualToString("initialDestination.style['-webkit-scroll-snap-coordinate']", "none");
shouldBeEqualToString("window.getComputedStyle(initialDestination).getPropertyValue('-webkit-scroll-snap-coordinate')", "none");
var initialSnapCoordinate = document.getElementById('initialSnapCoordinate');
@@ -289,7 +289,7 @@
shouldBeEqualToString("window.getComputedStyle(noneSnapCoordinateAndDestination).getPropertyValue('-webkit-scroll-snap-points-y')", "repeat(100%)");
shouldBeEmptyString("noneSnapCoordinateAndDestination.style['-webkit-scroll-snap-destination']");
shouldBeEqualToString("window.getComputedStyle(noneSnapCoordinateAndDestination).getPropertyValue('-webkit-scroll-snap-destination')", "0px 0px");
- shouldBeEmptyString("noneSnapCoordinateAndDestination.style['-webkit-scroll-snap-coordinate']");
+ shouldBeEqualToString("noneSnapCoordinateAndDestination.style['-webkit-scroll-snap-coordinate']", "none");
shouldBeEqualToString("window.getComputedStyle(noneSnapCoordinateAndDestination).getPropertyValue('-webkit-scroll-snap-coordinate')", "none");
var calculatedCoordinateAndDestination = document.getElementById('calculatedCoordinateAndDestination');
Modified: trunk/LayoutTests/editing/execCommand/insert-list-with-noneditable-content-expected.txt (209459 => 209460)
--- trunk/LayoutTests/editing/execCommand/insert-list-with-noneditable-content-expected.txt 2016-12-07 16:48:03 UTC (rev 209459)
+++ trunk/LayoutTests/editing/execCommand/insert-list-with-noneditable-content-expected.txt 2016-12-07 17:18:45 UTC (rev 209460)
@@ -3,7 +3,7 @@
| <li>
| "Editabl<#selection-anchor>e paragraph containing a "
| <span>
-| style="background-color: rgb(211, 211, 211);"
+| style="background-color: lightgray;"
| "non-editable"
| " in the middle"
| <br>
Modified: trunk/LayoutTests/fast/css/object-position/parsing-object-position-expected.txt (209459 => 209460)
--- trunk/LayoutTests/fast/css/object-position/parsing-object-position-expected.txt 2016-12-07 16:48:03 UTC (rev 209459)
+++ trunk/LayoutTests/fast/css/object-position/parsing-object-position-expected.txt 2016-12-07 17:18:45 UTC (rev 209460)
@@ -6,8 +6,8 @@
PASS testComputedStyle(";") is "50% 50%"
PASS test("object-position: inherit;") is "inherit"
PASS test("object-position: initial;") is "initial"
-PASS test("object-position: 23px;") is "23px 50%"
-PASS test("object-position: center 23px;") is "50% 23px"
+PASS test("object-position: 23px;") is "23px center"
+PASS test("object-position: center 23px;") is "50% center"
PASS test("object-position: 50% 23px;") is "50% 23px"
PASS test("object-position: 50% left;") is ""
PASS test("object-position: left 10px top 15px;") is "left 10px top 15px"
Modified: trunk/LayoutTests/fast/css/object-position/parsing-object-position.html (209459 => 209460)
--- trunk/LayoutTests/fast/css/object-position/parsing-object-position.html 2016-12-07 16:48:03 UTC (rev 209459)
+++ trunk/LayoutTests/fast/css/object-position/parsing-object-position.html 2016-12-07 17:18:45 UTC (rev 209460)
@@ -33,8 +33,8 @@
shouldBe('test("object-position: inherit;")', '"inherit"');
shouldBe('test("object-position: initial;")', '"initial"');
- shouldBeEqualToString('test("object-position: 23px;")', '23px 50%');
- shouldBeEqualToString('test("object-position: center 23px;")', '50% 23px');
+ shouldBeEqualToString('test("object-position: 23px;")', '23px center');
+ shouldBeEqualToString('test("object-position: center 23px;")', 'center 23px');
shouldBeEqualToString('test("object-position: 50% 23px;")', '50% 23px');
shouldBeEqualToString('test("object-position: 50% left;")', '');
Modified: trunk/LayoutTests/fast/css/parsing-css-number-types-expected.txt (209459 => 209460)
--- trunk/LayoutTests/fast/css/parsing-css-number-types-expected.txt 2016-12-07 16:48:03 UTC (rev 209459)
+++ trunk/LayoutTests/fast/css/parsing-css-number-types-expected.txt 2016-12-07 17:18:45 UTC (rev 209460)
@@ -1,25 +1,25 @@
Test parsing of CSS number types.
-FAILURE
+SUCCESS
Rules from the stylesheet:
#a { font-size: 1em; }
-#b { }
-#c { }
-#d { }
+#b { font-size: 1em; }
+#c { font-size: 1em; }
+#d { font-size: 1em; }
#e { font-size: 1rem; }
-#f { }
+#f { font-size: 1ex; }
#g { font-size: 16px; }
#h { font-size: 16px; }
-#i { }
-#j { }
+#i { font-size: 16px; }
+#j { font-size: 16px; }
#k { font-size: 1cm; }
-#l { }
+#l { font-size: 1mm; }
#m { font-size: 1in; }
#n { font-size: 12pt; }
-#o { }
-#p { }
+#o { font-size: 16px; }
+#p { font-size: 1pc; }
#q { font-size: 100%; }
Expected result:
Modified: trunk/LayoutTests/fast/css/parsing-css-wrap-expected.txt (209459 => 209460)
--- trunk/LayoutTests/fast/css/parsing-css-wrap-expected.txt 2016-12-07 16:48:03 UTC (rev 209459)
+++ trunk/LayoutTests/fast/css/parsing-css-wrap-expected.txt 2016-12-07 17:18:45 UTC (rev 209460)
@@ -1,6 +1,6 @@
Test parsing of CSS '\r\n' newline characters.
-FAILURE
+SUCCESS
Rules from the stylesheet:
Modified: trunk/LayoutTests/fast/css/script-tests/transform-origin-parsing.js (209459 => 209460)
--- trunk/LayoutTests/fast/css/script-tests/transform-origin-parsing.js 2016-12-07 16:48:03 UTC (rev 209459)
+++ trunk/LayoutTests/fast/css/script-tests/transform-origin-parsing.js 2016-12-07 17:18:45 UTC (rev 209460)
@@ -17,5 +17,5 @@
shouldBeEqualToString('test("-webkit-transform-origin: 10px 10px 10%", "-webkit-transform-origin")', '');
shouldBe('test("-webkit-transform-origin: 10px 10px 10px", "-webkit-transform-origin")', '"10px 10px 10px"');
shouldBeEqualToString('test("-webkit-transform-origin: left top 10%", "-webkit-transform-origin")', '');
-shouldBe('test("-webkit-transform-origin: left top 10px", "-webkit-transform-origin")', '"0% 0% 10px"');
+shouldBe('test("-webkit-transform-origin: left top 10px", "-webkit-transform-origin")', '"left top 10px"');
shouldBeEqualToString('test("-webkit-transform-origin: left top left", "-webkit-transform-origin")', '');
Modified: trunk/LayoutTests/fast/css/transform-inline-style-remove-expected.txt (209459 => 209460)
--- trunk/LayoutTests/fast/css/transform-inline-style-remove-expected.txt 2016-12-07 16:48:03 UTC (rev 209459)
+++ trunk/LayoutTests/fast/css/transform-inline-style-remove-expected.txt 2016-12-07 17:18:45 UTC (rev 209460)
@@ -12,8 +12,8 @@
transition duration (after):
transition timing function (after):
-transform origin (before): 0% 30%
-transform origin X (before): 0%
+transform origin (before): left 30%
+transform origin X (before): left
transform origin Y (before): 30%
transform origin (after):
transform origin X (after):
Modified: trunk/LayoutTests/fast/css/transform-origin-parsing-expected.txt (209459 => 209460)
--- trunk/LayoutTests/fast/css/transform-origin-parsing-expected.txt 2016-12-07 16:48:03 UTC (rev 209459)
+++ trunk/LayoutTests/fast/css/transform-origin-parsing-expected.txt 2016-12-07 17:18:45 UTC (rev 209460)
@@ -8,7 +8,7 @@
PASS test("-webkit-transform-origin: 10px 10px 10%", "-webkit-transform-origin") is ""
PASS test("-webkit-transform-origin: 10px 10px 10px", "-webkit-transform-origin") is "10px 10px 10px"
PASS test("-webkit-transform-origin: left top 10%", "-webkit-transform-origin") is ""
-PASS test("-webkit-transform-origin: left top 10px", "-webkit-transform-origin") is "0% 0% 10px"
+PASS test("-webkit-transform-origin: left top 10px", "-webkit-transform-origin") is "left top 10px"
PASS test("-webkit-transform-origin: left top left", "-webkit-transform-origin") is ""
PASS successfullyParsed is true
Modified: trunk/LayoutTests/fast/css/variables/custom-property-dynamic-update-expected.html (209459 => 209460)
--- trunk/LayoutTests/fast/css/variables/custom-property-dynamic-update-expected.html 2016-12-07 16:48:03 UTC (rev 209459)
+++ trunk/LayoutTests/fast/css/variables/custom-property-dynamic-update-expected.html 2016-12-07 17:18:45 UTC (rev 209460)
@@ -1,6 +1,6 @@
<html>
<body>
-linear-gradient(to top, rgb(204, 0, 102), white)<br>
+linear-gradient(to top, #c06, white)<br>
linear-gradient(to top, green, white)
</body>
</html>
Modified: trunk/LayoutTests/fast/events/mouse-cursor-expected.txt (209459 => 209460)
--- trunk/LayoutTests/fast/events/mouse-cursor-expected.txt 2016-12-07 16:48:03 UTC (rev 209459)
+++ trunk/LayoutTests/fast/events/mouse-cursor-expected.txt 2016-12-07 17:18:45 UTC (rev 209460)
@@ -25,7 +25,7 @@
Cursor Info: type=Grabbing hotSpot=0,0
TEST CASE: Existing 25x25 image
-Cursor Info: type=Custom hotSpot=0,0 image=25x25
+Cursor Info: type=IBeam hotSpot=0,0
TEST CASE: Invalid URL with fallback to pointer
Cursor Info: type=Hand hotSpot=0,0
Modified: trunk/LayoutTests/fast/inspector-support/style-expected.txt (209459 => 209460)
--- trunk/LayoutTests/fast/inspector-support/style-expected.txt 2016-12-07 16:48:03 UTC (rev 209459)
+++ trunk/LayoutTests/fast/inspector-support/style-expected.txt 2016-12-07 17:18:45 UTC (rev 209460)
@@ -1,15 +1,15 @@
Note that background is buggy right now!
Test
background-image: initial (original property was background)
+background-position-x: initial (original property was background)
+background-position-y: initial (original property was background)
+background-size: initial (original property was background)
background-repeat-x: initial (original property was background)
background-repeat-y: initial (original property was background)
background-attachment: initial (original property was background)
-background-position-x: initial (original property was background)
-background-position-y: initial (original property was background)
background-origin: initial (original property was background)
background-clip: initial (original property was background)
background-color: purple (original property was background)
-background-size: initial (original property was background)
margin-top: 1em (original property was margin)
margin-right: 1em (original property was margin and property was implicitly set.)
margin-bottom: 1em (original property was margin and property was implicitly set.)
Modified: trunk/LayoutTests/platform/mac/svg/webarchive/svg-script-subresouces-expected.txt (209459 => 209460)
--- trunk/LayoutTests/platform/mac/svg/webarchive/svg-script-subresouces-expected.txt 2016-12-07 16:48:03 UTC (rev 209459)
+++ trunk/LayoutTests/platform/mac/svg/webarchive/svg-script-subresouces-expected.txt 2016-12-07 17:18:45 UTC (rev 209460)
@@ -10,7 +10,7 @@
if (window.testRunner)
testRunner.dumpDOMAsWebArchive();
</script>
- <rect id="rect" width="100" height="100" fill="red" style="fill: rgb(0, 128, 0);"/>
+ <rect id="rect" width="100" height="100" fill="red" style="fill: green;"/>
<script xlink:href="" type="text/ecmascript"/>
</svg></string>
<key>WebResourceFrameName</key>
Modified: trunk/Source/WebCore/ChangeLog (209459 => 209460)
--- trunk/Source/WebCore/ChangeLog 2016-12-07 16:48:03 UTC (rev 209459)
+++ trunk/Source/WebCore/ChangeLog 2016-12-07 17:18:45 UTC (rev 209460)
@@ -1,3 +1,19 @@
+2016-12-07 Dave Hyatt <hy...@apple.com>
+
+ [CSS Parser] Turn back on a bunch of layout tests
+ https://bugs.webkit.org/show_bug.cgi?id=165529
+
+ Reviewed by Zalan Bujtas.
+
+ Fixes fast/css/transform-origin-parsing.html.
+
+ * css/parser/CSSPropertyParser.cpp:
+ (WebCore::CSSPropertyParser::consumeTransformOrigin):
+ The implicit check was relying on a null check of the z value, but
+ we called releaseNonNull on it already. This meant all z properties were
+ marked as implicit incorrectly. Fix by storing whether or not we had a z
+ value in a local variable.
+
2016-12-07 Andreas Kling <akl...@apple.com>
[iOS] Remove bitrotted FrameLoader attempt to limit page caching under memory pressure.
Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (209459 => 209460)
--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-12-07 16:48:03 UTC (rev 209459)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-12-07 17:18:45 UTC (rev 209460)
@@ -375,11 +375,12 @@
m_range.consumeWhitespace();
bool atEnd = m_range.atEnd();
RefPtr<CSSPrimitiveValue> resultZ = consumeLength(m_range, m_context.mode, ValueRangeAll);
- if (!resultZ && !atEnd)
+ bool hasZ = resultZ;
+ if (!hasZ && !atEnd)
return false;
addProperty(CSSPropertyTransformOriginX, CSSPropertyTransformOrigin, resultX.releaseNonNull(), important);
addProperty(CSSPropertyTransformOriginY, CSSPropertyTransformOrigin, resultY.releaseNonNull(), important);
- addProperty(CSSPropertyTransformOriginZ, CSSPropertyTransformOrigin, resultZ ? resultZ.releaseNonNull() : CSSValuePool::singleton().createValue(0, CSSPrimitiveValue::UnitTypes::CSS_PX), important, !resultZ);
+ addProperty(CSSPropertyTransformOriginZ, CSSPropertyTransformOrigin, resultZ ? resultZ.releaseNonNull() : CSSValuePool::singleton().createValue(0, CSSPrimitiveValue::UnitTypes::CSS_PX), important, !hasZ);
return true;
}
