Diff
Modified: trunk/LayoutTests/ChangeLog (268888 => 268889)
--- trunk/LayoutTests/ChangeLog 2020-10-22 20:29:18 UTC (rev 268888)
+++ trunk/LayoutTests/ChangeLog 2020-10-22 20:31:49 UTC (rev 268889)
@@ -1,3 +1,12 @@
+2020-10-22 Martin Robinson <[email protected]>
+
+ Rename scroll-snap-margin to scroll-margin
+ https://bugs.webkit.org/show_bug.cgi?id=218075
+
+ Reviewed by Simon Fraser.
+
+ * platform/ios-wk2/imported/w3c/web-platform-tests/css/cssom/cssstyledeclaration-csstext-expected.txt: Update results for this test.
+
2020-10-22 Noam Rosenthal <[email protected]>
Support EXIF image resolution in CoreGraphics (OSX/iOS)
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (268888 => 268889)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2020-10-22 20:29:18 UTC (rev 268888)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2020-10-22 20:31:49 UTC (rev 268889)
@@ -1,3 +1,17 @@
+2020-10-22 Martin Robinson <[email protected]>
+
+ Rename scroll-snap-margin to scroll-margin
+ https://bugs.webkit.org/show_bug.cgi?id=218075
+
+ Reviewed by Simon Fraser.
+
+ * web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt: Update result for newly passing test.
+ * web-platform-tests/css/css-scroll-snap/inheritance-expected.txt: Ditto
+ * web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-computed-expected.txt: Ditto.
+ * web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-shorthand-expected.txt: Ditto.
+ * web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-valid-expected.txt: Ditto.
+ * web-platform-tests/css/cssom/cssstyledeclaration-csstext-expected.txt: Ditto.
+
2020-10-22 Noam Rosenthal <[email protected]>
Support EXIF image resolution in CoreGraphics (macOS/iOS)
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt (268888 => 268889)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt 2020-10-22 20:29:18 UTC (rev 268888)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt 2020-10-22 20:31:49 UTC (rev 268889)
@@ -221,15 +221,15 @@
PASS ry
PASS scale
PASS scroll-behavior
+PASS scroll-margin-bottom
+PASS scroll-margin-left
+PASS scroll-margin-right
+PASS scroll-margin-top
PASS scroll-padding-bottom
PASS scroll-padding-left
PASS scroll-padding-right
PASS scroll-padding-top
PASS scroll-snap-align
-PASS scroll-snap-margin-bottom
-PASS scroll-snap-margin-left
-PASS scroll-snap-margin-right
-PASS scroll-snap-margin-top
PASS scroll-snap-type
PASS shape-image-threshold
PASS shape-margin
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-scroll-snap/inheritance-expected.txt (268888 => 268889)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-scroll-snap/inheritance-expected.txt 2020-10-22 20:29:18 UTC (rev 268888)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-scroll-snap/inheritance-expected.txt 2020-10-22 20:31:49 UTC (rev 268889)
@@ -3,18 +3,18 @@
FAIL Property scroll-margin-block-end does not inherit assert_true: expected true got false
FAIL Property scroll-margin-block-start has initial value 0px assert_true: scroll-margin-block-start doesn't seem to be supported in the computed style expected true got false
FAIL Property scroll-margin-block-start does not inherit assert_true: expected true got false
-FAIL Property scroll-margin-bottom has initial value 0px assert_true: scroll-margin-bottom doesn't seem to be supported in the computed style expected true got false
-FAIL Property scroll-margin-bottom does not inherit assert_true: expected true got false
+PASS Property scroll-margin-bottom has initial value 0px
+PASS Property scroll-margin-bottom does not inherit
FAIL Property scroll-margin-inline-end has initial value 0px assert_true: scroll-margin-inline-end doesn't seem to be supported in the computed style expected true got false
FAIL Property scroll-margin-inline-end does not inherit assert_true: expected true got false
FAIL Property scroll-margin-inline-start has initial value 0px assert_true: scroll-margin-inline-start doesn't seem to be supported in the computed style expected true got false
FAIL Property scroll-margin-inline-start does not inherit assert_true: expected true got false
-FAIL Property scroll-margin-left has initial value 0px assert_true: scroll-margin-left doesn't seem to be supported in the computed style expected true got false
-FAIL Property scroll-margin-left does not inherit assert_true: expected true got false
-FAIL Property scroll-margin-right has initial value 0px assert_true: scroll-margin-right doesn't seem to be supported in the computed style expected true got false
-FAIL Property scroll-margin-right does not inherit assert_true: expected true got false
-FAIL Property scroll-margin-top has initial value 0px assert_true: scroll-margin-top doesn't seem to be supported in the computed style expected true got false
-FAIL Property scroll-margin-top does not inherit assert_true: expected true got false
+PASS Property scroll-margin-left has initial value 0px
+PASS Property scroll-margin-left does not inherit
+PASS Property scroll-margin-right has initial value 0px
+PASS Property scroll-margin-right does not inherit
+PASS Property scroll-margin-top has initial value 0px
+PASS Property scroll-margin-top does not inherit
FAIL Property scroll-padding-block-end has initial value auto assert_true: scroll-padding-block-end doesn't seem to be supported in the computed style expected true got false
FAIL Property scroll-padding-block-end does not inherit assert_true: expected true got false
FAIL Property scroll-padding-block-start has initial value auto assert_true: scroll-padding-block-start doesn't seem to be supported in the computed style expected true got false
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-computed-expected.txt (268888 => 268889)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-computed-expected.txt 2020-10-22 20:29:18 UTC (rev 268888)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-computed-expected.txt 2020-10-22 20:31:49 UTC (rev 268889)
@@ -1,13 +1,13 @@
-FAIL Property scroll-margin-top value '10px' assert_true: scroll-margin-top doesn't seem to be supported in the computed style expected true got false
-FAIL Property scroll-margin-top value 'calc(10px - 0.5em)' assert_true: scroll-margin-top doesn't seem to be supported in the computed style expected true got false
-FAIL Property scroll-margin-right value '10px' assert_true: scroll-margin-right doesn't seem to be supported in the computed style expected true got false
-FAIL Property scroll-margin-right value 'calc(10px - 0.5em)' assert_true: scroll-margin-right doesn't seem to be supported in the computed style expected true got false
-FAIL Property scroll-margin-bottom value '10px' assert_true: scroll-margin-bottom doesn't seem to be supported in the computed style expected true got false
-FAIL Property scroll-margin-bottom value 'calc(10px - 0.5em)' assert_true: scroll-margin-bottom doesn't seem to be supported in the computed style expected true got false
-FAIL Property scroll-margin-left value '10px' assert_true: scroll-margin-left doesn't seem to be supported in the computed style expected true got false
-FAIL Property scroll-margin-left value 'calc(10px - 0.5em)' assert_true: scroll-margin-left doesn't seem to be supported in the computed style expected true got false
-FAIL Property scroll-margin value '10px' assert_true: scroll-margin doesn't seem to be supported in the computed style expected true got false
-FAIL Property scroll-margin value 'calc(10px - 0.5em)' assert_true: scroll-margin doesn't seem to be supported in the computed style expected true got false
-FAIL Property scroll-margin value '1px 2px' assert_true: scroll-margin doesn't seem to be supported in the computed style expected true got false
+PASS Property scroll-margin-top value '10px'
+PASS Property scroll-margin-top value 'calc(10px - 0.5em)'
+PASS Property scroll-margin-right value '10px'
+PASS Property scroll-margin-right value 'calc(10px - 0.5em)'
+PASS Property scroll-margin-bottom value '10px'
+PASS Property scroll-margin-bottom value 'calc(10px - 0.5em)'
+PASS Property scroll-margin-left value '10px'
+PASS Property scroll-margin-left value 'calc(10px - 0.5em)'
+PASS Property scroll-margin value '10px'
+PASS Property scroll-margin value 'calc(10px - 0.5em)'
+PASS Property scroll-margin value '1px 2px'
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-shorthand-expected.txt (268888 => 268889)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-shorthand-expected.txt 2020-10-22 20:29:18 UTC (rev 268888)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-shorthand-expected.txt 2020-10-22 20:31:49 UTC (rev 268889)
@@ -1,22 +1,22 @@
-FAIL e.style['scroll-margin'] = "10px" should set scroll-margin-bottom assert_equals: scroll-margin-bottom should be canonical expected (string) "10px" but got (undefined) undefined
-FAIL e.style['scroll-margin'] = "10px" should set scroll-margin-left assert_equals: scroll-margin-left should be canonical expected (string) "10px" but got (undefined) undefined
-FAIL e.style['scroll-margin'] = "10px" should set scroll-margin-right assert_equals: scroll-margin-right should be canonical expected (string) "10px" but got (undefined) undefined
-FAIL e.style['scroll-margin'] = "10px" should set scroll-margin-top assert_equals: scroll-margin-top should be canonical expected (string) "10px" but got (undefined) undefined
-FAIL e.style['scroll-margin'] = "10px" should not set unrelated longhands assert_true: expected true got false
-FAIL e.style['scroll-margin'] = "30px 20px" should set scroll-margin-bottom assert_equals: scroll-margin-bottom should be canonical expected (string) "30px" but got (undefined) undefined
-FAIL e.style['scroll-margin'] = "30px 20px" should set scroll-margin-left assert_equals: scroll-margin-left should be canonical expected (string) "20px" but got (undefined) undefined
-FAIL e.style['scroll-margin'] = "30px 20px" should set scroll-margin-right assert_equals: scroll-margin-right should be canonical expected (string) "20px" but got (undefined) undefined
-FAIL e.style['scroll-margin'] = "30px 20px" should set scroll-margin-top assert_equals: scroll-margin-top should be canonical expected (string) "30px" but got (undefined) undefined
-FAIL e.style['scroll-margin'] = "30px 20px" should not set unrelated longhands assert_true: expected true got false
-FAIL e.style['scroll-margin'] = "1px 2px 3px" should set scroll-margin-bottom assert_equals: scroll-margin-bottom should be canonical expected (string) "3px" but got (undefined) undefined
-FAIL e.style['scroll-margin'] = "1px 2px 3px" should set scroll-margin-left assert_equals: scroll-margin-left should be canonical expected (string) "2px" but got (undefined) undefined
-FAIL e.style['scroll-margin'] = "1px 2px 3px" should set scroll-margin-right assert_equals: scroll-margin-right should be canonical expected (string) "2px" but got (undefined) undefined
-FAIL e.style['scroll-margin'] = "1px 2px 3px" should set scroll-margin-top assert_equals: scroll-margin-top should be canonical expected (string) "1px" but got (undefined) undefined
-FAIL e.style['scroll-margin'] = "1px 2px 3px" should not set unrelated longhands assert_true: expected true got false
-FAIL e.style['scroll-margin'] = "-1px 2px 3px 0" should set scroll-margin-bottom assert_equals: scroll-margin-bottom should be canonical expected (string) "3px" but got (undefined) undefined
-FAIL e.style['scroll-margin'] = "-1px 2px 3px 0" should set scroll-margin-left assert_equals: scroll-margin-left should be canonical expected (string) "0px" but got (undefined) undefined
-FAIL e.style['scroll-margin'] = "-1px 2px 3px 0" should set scroll-margin-right assert_equals: scroll-margin-right should be canonical expected (string) "2px" but got (undefined) undefined
-FAIL e.style['scroll-margin'] = "-1px 2px 3px 0" should set scroll-margin-top assert_equals: scroll-margin-top should be canonical expected (string) "-1px" but got (undefined) undefined
-FAIL e.style['scroll-margin'] = "-1px 2px 3px 0" should not set unrelated longhands assert_true: expected true got false
+PASS e.style['scroll-margin'] = "10px" should set scroll-margin-bottom
+PASS e.style['scroll-margin'] = "10px" should set scroll-margin-left
+PASS e.style['scroll-margin'] = "10px" should set scroll-margin-right
+PASS e.style['scroll-margin'] = "10px" should set scroll-margin-top
+PASS e.style['scroll-margin'] = "10px" should not set unrelated longhands
+PASS e.style['scroll-margin'] = "30px 20px" should set scroll-margin-bottom
+PASS e.style['scroll-margin'] = "30px 20px" should set scroll-margin-left
+PASS e.style['scroll-margin'] = "30px 20px" should set scroll-margin-right
+PASS e.style['scroll-margin'] = "30px 20px" should set scroll-margin-top
+PASS e.style['scroll-margin'] = "30px 20px" should not set unrelated longhands
+PASS e.style['scroll-margin'] = "1px 2px 3px" should set scroll-margin-bottom
+PASS e.style['scroll-margin'] = "1px 2px 3px" should set scroll-margin-left
+PASS e.style['scroll-margin'] = "1px 2px 3px" should set scroll-margin-right
+PASS e.style['scroll-margin'] = "1px 2px 3px" should set scroll-margin-top
+PASS e.style['scroll-margin'] = "1px 2px 3px" should not set unrelated longhands
+PASS e.style['scroll-margin'] = "-1px 2px 3px 0" should set scroll-margin-bottom
+PASS e.style['scroll-margin'] = "-1px 2px 3px 0" should set scroll-margin-left
+PASS e.style['scroll-margin'] = "-1px 2px 3px 0" should set scroll-margin-right
+PASS e.style['scroll-margin'] = "-1px 2px 3px 0" should set scroll-margin-top
+PASS e.style['scroll-margin'] = "-1px 2px 3px 0" should not set unrelated longhands
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-valid-expected.txt (268888 => 268889)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-valid-expected.txt 2020-10-22 20:29:18 UTC (rev 268888)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-valid-expected.txt 2020-10-22 20:31:49 UTC (rev 268889)
@@ -1,21 +1,21 @@
-FAIL e.style['scroll-margin-top'] = "0" should set the property value assert_not_equals: property should be set got disallowed value ""
-FAIL e.style['scroll-margin-top'] = "-10px" should set the property value assert_not_equals: property should be set got disallowed value ""
-FAIL e.style['scroll-margin-top'] = "calc(2em + 3ex)" should set the property value assert_not_equals: property should be set got disallowed value ""
-FAIL e.style['scroll-margin-right'] = "0" should set the property value assert_not_equals: property should be set got disallowed value ""
-FAIL e.style['scroll-margin-right'] = "-10px" should set the property value assert_not_equals: property should be set got disallowed value ""
-FAIL e.style['scroll-margin-right'] = "calc(2em + 3ex)" should set the property value assert_not_equals: property should be set got disallowed value ""
-FAIL e.style['scroll-margin-bottom'] = "0" should set the property value assert_not_equals: property should be set got disallowed value ""
-FAIL e.style['scroll-margin-bottom'] = "-10px" should set the property value assert_not_equals: property should be set got disallowed value ""
-FAIL e.style['scroll-margin-bottom'] = "calc(2em + 3ex)" should set the property value assert_not_equals: property should be set got disallowed value ""
-FAIL e.style['scroll-margin-left'] = "0" should set the property value assert_not_equals: property should be set got disallowed value ""
-FAIL e.style['scroll-margin-left'] = "-10px" should set the property value assert_not_equals: property should be set got disallowed value ""
-FAIL e.style['scroll-margin-left'] = "calc(2em + 3ex)" should set the property value assert_not_equals: property should be set got disallowed value ""
-FAIL e.style['scroll-margin'] = "0" should set the property value assert_not_equals: property should be set got disallowed value ""
-FAIL e.style['scroll-margin'] = "-10px" should set the property value assert_not_equals: property should be set got disallowed value ""
-FAIL e.style['scroll-margin'] = "calc(2em + 3ex)" should set the property value assert_not_equals: property should be set got disallowed value ""
-FAIL e.style['scroll-margin'] = "1px 2px" should set the property value assert_not_equals: property should be set got disallowed value ""
-FAIL e.style['scroll-margin'] = "1px 2px 3px" should set the property value assert_not_equals: property should be set got disallowed value ""
-FAIL e.style['scroll-margin'] = "1px 2px 3px 4px" should set the property value assert_not_equals: property should be set got disallowed value ""
-FAIL e.style['scroll-margin'] = "0 0 0 0" should set the property value assert_not_equals: property should be set got disallowed value ""
+PASS e.style['scroll-margin-top'] = "0" should set the property value
+PASS e.style['scroll-margin-top'] = "-10px" should set the property value
+PASS e.style['scroll-margin-top'] = "calc(2em + 3ex)" should set the property value
+PASS e.style['scroll-margin-right'] = "0" should set the property value
+PASS e.style['scroll-margin-right'] = "-10px" should set the property value
+PASS e.style['scroll-margin-right'] = "calc(2em + 3ex)" should set the property value
+PASS e.style['scroll-margin-bottom'] = "0" should set the property value
+PASS e.style['scroll-margin-bottom'] = "-10px" should set the property value
+PASS e.style['scroll-margin-bottom'] = "calc(2em + 3ex)" should set the property value
+PASS e.style['scroll-margin-left'] = "0" should set the property value
+PASS e.style['scroll-margin-left'] = "-10px" should set the property value
+PASS e.style['scroll-margin-left'] = "calc(2em + 3ex)" should set the property value
+PASS e.style['scroll-margin'] = "0" should set the property value
+PASS e.style['scroll-margin'] = "-10px" should set the property value
+PASS e.style['scroll-margin'] = "calc(2em + 3ex)" should set the property value
+PASS e.style['scroll-margin'] = "1px 2px" should set the property value
+PASS e.style['scroll-margin'] = "1px 2px 3px" should set the property value
+PASS e.style['scroll-margin'] = "1px 2px 3px 4px" should set the property value
+PASS e.style['scroll-margin'] = "0 0 0 0" should set the property value
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom/cssstyledeclaration-csstext-expected.txt (268888 => 268889)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom/cssstyledeclaration-csstext-expected.txt 2020-10-22 20:29:18 UTC (rev 268888)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom/cssstyledeclaration-csstext-expected.txt 2020-10-22 20:31:49 UTC (rev 268889)
@@ -7,5 +7,5 @@
PASS another cssText order (non-alphabetical order)
PASS whitespaces in value
PASS invalid property does not appear
-FAIL cssText on computed style declaration returns the empty string assert_equals: cssText is empty expected "" but got "align-content: normal; align-items: normal; align-self: auto; alignment-baseline: auto; all: ; alt: \"\"; animation-delay: 0s; animation-direction: normal; animation-duration: 0s; animation-fill-mode: none; animation-iteration-count: 1; animation-name: none; animation-play-state: running; animation-timing-function: ease; background-attachment: scroll; background-blend-mode: normal; background-clip: border-box; background-color: rgba(0, 0, 0, 0); background-image: none; background-origin: padding-box; background-position-x: 0%; background-position-y: 0%; background-repeat: repeat; background-size: auto; baseline-shift: baseline; block-size: 0px; border-block-end-color: rgb(255, 0, 0); border-block-end-style: none; border-block-end-width: 0px; border-block-start-color: rgb(255, 0, 0); border-block-start-style: none; border-block-
start-width: 0px; border-bottom-color: rgb(255, 0, 0); border-bottom-left-radius: 0px; border-bottom-right-radius: 0px; border-bottom-style: none; border-bottom-width: 0px; border-collapse: separate; border-image-outset: 0px; border-image-repeat: stretch; border-image-slice: 100%; border-image-source: none; border-image-width: 1; border-inline-end-color: rgb(255, 0, 0); border-inline-end-style: none; border-inline-end-width: 0px; border-inline-start-color: rgb(255, 0, 0); border-inline-start-style: none; border-inline-start-width: 0px; border-left-color: rgb(255, 0, 0); border-left-style: none; border-left-width: 0px; border-right-color: rgb(255, 0, 0); border-right-style: none; border-right-width: 0px; border-top-color: rgb(255, 0, 0); border-top-left-radius: 0px; border-top-right-radius: 0px; border-top-style: none; border-top-width: 0px; bottom: auto; box-shadow: none; box-sizing: content-box; break-after: auto; break-before: auto; break-inside: auto; buffered-rendering: auto; ca
ption-side: top; caret-color: rgb(255, 0, 0); clear: none; clip: auto; clip-path: none; clip-rule: nonzero; color: rgb(255, 0, 0); color-interpolation: sRGB; color-interpolation-filters: linearRGB; color-rendering: auto; color-scheme: auto; column-count: auto; column-fill: balance; column-gap: normal; column-rule-color: rgb(255, 0, 0); column-rule-style: none; column-rule-width: 0px; column-span: none; column-width: auto; content: ; counter-increment: none; counter-reset: none; cursor: auto; cx: 0px; cy: 0px; direction: ltr; display: block; dominant-baseline: auto; empty-cells: show; fill: rgb(0, 0, 0); fill-opacity: 1; fill-rule: nonzero; filter: none; flex-basis: auto; flex-direction: row; flex-grow: 0; flex-shrink: 1; flex-wrap: nowrap; float: none; flood-color: rgb(0, 0, 0); flood-opacity: 1; font-family: -webkit-standard; font-feature-settings: normal; font-optical-sizing: auto; font-size: 13.333333015441895px; font-stretch: normal; font-style: normal; font-synthesis: style wei
ght small-caps; font-variant-alternates: normal; font-variant-caps: normal; font-variant-east-asian: normal; font-variant-ligatures: normal; font-variant-numeric: normal; font-variant-position: normal; font-variation-settings: normal; font-weight: normal; glyph-orientation-horizontal: 0deg; glyph-orientation-vertical: auto; grid-auto-columns: auto; grid-auto-flow: row; grid-auto-rows: auto; grid-column-end: auto; grid-column-start: auto; grid-row-end: auto; grid-row-start: auto; grid-template-areas: none; grid-template-columns: none; grid-template-rows: none; hanging-punctuation: none; height: 0px; image-orientation: from-image; image-rendering: auto; inline-size: 784px; inset-block-end: auto; inset-block-start: auto; inset-inline-end: auto; inset-inline-start: auto; isolation: auto; justify-content: normal; justify-items: normal; justify-self: auto; kerning: 0; left: auto; letter-spacing: normal; lighting-color: rgb(255, 255, 255); line-break: auto; line-height: normal; list-style-
image: none; list-style-position: outside; list-style-type: disc; margin-block-end: 0px; margin-block-start: 0px; margin-bottom: 0px; margin-inline-end: 0px; margin-inline-start: 0px; margin-left: 0px; margin-right: 0px; margin-top: 0px; marker-end: none; marker-mid: none; marker-start: none; mask: none; mask-type: luminance; math-style: normal; max-block-size: none; max-height: none; max-inline-size: none; max-width: none; min-block-size: 0px; min-height: 0px; min-inline-size: 0px; min-width: 0px; mix-blend-mode: normal; object-fit: fill; object-position: 50% 50%; opacity: 1; order: 0; orphans: auto; outline-color: rgb(255, 0, 0); outline-offset: 0px; outline-style: none; outline-width: 0px; overflow-wrap: normal; overflow-x: visible; overflow-y: visible; padding-block-end: 0px; padding-block-start: 0px; padding-bottom: 0px; padding-inline-end: 0px; padding-inline-start: 0px; padding-left: 0px; padding-right: 0px; padding-top: 0px; page-break-after: auto; page-break-before: auto; p
age-break-inside: auto; paint-order: normal; perspective: none; perspective-origin-x: ; perspective-origin-y: ; pointer-events: auto; position: static; quotes: auto; r: 0px; resize: none; right: auto; rotate: none; row-gap: normal; rx: auto; ry: auto; scale: none; scroll-behavior: auto; scroll-padding-bottom: 0px; scroll-padding-left: 0px; scroll-padding-right: 0px; scroll-padding-top: 0px; scroll-snap-align: none none; scroll-snap-margin-bottom: 0px; scroll-snap-margin-left: 0px; scroll-snap-margin-right: 0px; scroll-snap-margin-top: 0px; scroll-snap-type: none; shape-image-threshold: 0; shape-margin: 0px; shape-outside: none; shape-rendering: auto; size: ; speak-as: normal; stop-color: rgb(0, 0, 0); stop-opacity: 1; stroke: none; stroke-color: rgba(0, 0, 0, 0); stroke-dasharray: none; stroke-dashoffset: 0px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-opacity: 1; stroke-width: 1px; tab-size: 8; table-layout: auto; text-align: start; text-anchor: star
t; text-decoration: none; text-decoration-color: rgb(255, 0, 0); text-decoration-line: none; text-decoration-skip: auto; text-decoration-style: solid; text-decoration-thickness: auto; text-indent: 0px; text-orientation: mixed; text-overflow: clip; text-rendering: auto; text-shadow: none; text-transform: none; text-underline-offset: auto; text-underline-position: auto; top: auto; touch-action: auto; transform: none; transform-box: view-box; transform-origin-x: ; transform-origin-y: ; transform-origin-z: ; transform-style: flat; transition-delay: 0s; transition-duration: 0s; transition-property: all; transition-timing-function: ease; translate: none; unicode-bidi: normal; vector-effect: none; vertical-align: baseline; visibility: visible; white-space: normal; widows: auto; width: 784px; will-change: auto; word-break: normal; word-spacing: 0px; word-wrap: normal; writing-mode: horizontal-tb; x: 0px; y: 0px; z-index: auto; zoom: 1; -apple-color-filter: none; -apple-pay-button-style: bla
ck; -apple-pay-button-type: plain; -apple-trailing-word: auto; -webkit-appearance: none; -webkit-aspect-ratio: auto; -webkit-backdrop-filter: none; -webkit-backface-visibility: visible; -webkit-background-clip: border-box; -webkit-background-composite: source-over; -webkit-background-origin: padding-box; -webkit-background-size: auto; -webkit-border-fit: border; -webkit-border-horizontal-spacing: 0px; -webkit-border-image: none; -webkit-border-vertical-spacing: 0px; -webkit-box-align: stretch; -webkit-box-decoration-break: slice; -webkit-box-direction: normal; -webkit-box-flex: 0; -webkit-box-flex-group: 1; -webkit-box-lines: single; -webkit-box-ordinal-group: 1; -webkit-box-orient: horizontal; -webkit-box-pack: start; -webkit-box-reflect: none; -webkit-box-shadow: none; -webkit-column-axis: auto; -webkit-column-break-after: auto; -webkit-column-break-before: auto; -webkit-column-break-inside: auto; -webkit-column-progression: normal; -webkit-cursor-visibility: auto; -webkit-font-ke
rning: auto; -webkit-font-smoothing: auto; -webkit-hyphenate-character: auto; -webkit-hyphenate-limit-after: auto; -webkit-hyphenate-limit-before: auto; -webkit-hyphenate-limit-lines: no-limit; -webkit-hyphens: manual; -webkit-initial-letter: normal; -webkit-line-align: none; -webkit-line-box-contain: block inline replaced; -webkit-line-clamp: none; -webkit-line-grid: none; -webkit-line-snap: none; -webkit-locale: auto; -webkit-margin-after-collapse: collapse; -webkit-margin-before-collapse: collapse; -webkit-margin-bottom-collapse: collapse; -webkit-margin-top-collapse: collapse; -webkit-mask-box-image: none; -webkit-mask-box-image-outset: 0px; -webkit-mask-box-image-repeat: stretch; -webkit-mask-box-image-slice: 0 fill; -webkit-mask-box-image-source: none; -webkit-mask-box-image-width: auto; -webkit-mask-clip: border-box; -webkit-mask-composite: source-over; -webkit-mask-image: none; -webkit-mask-origin: border-box; -webkit-mask-position-x: 0%; -webkit-mask-position-y: 0%; -webkit
-mask-repeat: repeat; -webkit-mask-size: auto; -webkit-mask-source-type: alpha; -webkit-nbsp-mode: normal; -webkit-print-color-adjust: economy; -webkit-rtl-ordering: logical; -webkit-ruby-position: before; -webkit-text-combine: none; -webkit-text-emphasis-color: rgb(255, 0, 0); -webkit-text-emphasis-position: over right; -webkit-text-emphasis-style: none; -webkit-text-fill-color: rgb(255, 0, 0); -webkit-text-orientation: mixed; -webkit-text-security: none; -webkit-text-size-adjust: auto; -webkit-text-stroke-color: rgb(255, 0, 0); -webkit-text-stroke-width: 0px; -webkit-text-zoom: normal; -webkit-transform-style: flat; -webkit-user-drag: auto; -webkit-user-modify: read-only; -webkit-user-select: text;"
+FAIL cssText on computed style declaration returns the empty string assert_equals: cssText is empty expected "" but got "align-content: normal; align-items: normal; align-self: auto; alignment-baseline: auto; all: ; alt: \"\"; animation-delay: 0s; animation-direction: normal; animation-duration: 0s; animation-fill-mode: none; animation-iteration-count: 1; animation-name: none; animation-play-state: running; animation-timing-function: ease; background-attachment: scroll; background-blend-mode: normal; background-clip: border-box; background-color: rgba(0, 0, 0, 0); background-image: none; background-origin: padding-box; background-position-x: 0%; background-position-y: 0%; background-repeat: repeat; background-size: auto; baseline-shift: baseline; block-size: 0px; border-block-end-color: rgb(255, 0, 0); border-block-end-style: none; border-block-end-width: 0px; border-block-start-color: rgb(255, 0, 0); border-block-start-style: none; border-block-s
tart-width: 0px; border-bottom-color: rgb(255, 0, 0); border-bottom-left-radius: 0px; border-bottom-right-radius: 0px; border-bottom-style: none; border-bottom-width: 0px; border-collapse: separate; border-image-outset: 0px; border-image-repeat: stretch; border-image-slice: 100%; border-image-source: none; border-image-width: 1; border-inline-end-color: rgb(255, 0, 0); border-inline-end-style: none; border-inline-end-width: 0px; border-inline-start-color: rgb(255, 0, 0); border-inline-start-style: none; border-inline-start-width: 0px; border-left-color: rgb(255, 0, 0); border-left-style: none; border-left-width: 0px; border-right-color: rgb(255, 0, 0); border-right-style: none; border-right-width: 0px; border-top-color: rgb(255, 0, 0); border-top-left-radius: 0px; border-top-right-radius: 0px; border-top-style: none; border-top-width: 0px; bottom: auto; box-shadow: none; box-sizing: content-box; break-after: auto; break-before: auto; break-inside: auto; buffered-rendering: auto; cap
tion-side: top; caret-color: rgb(255, 0, 0); clear: none; clip: auto; clip-path: none; clip-rule: nonzero; color: rgb(255, 0, 0); color-interpolation: sRGB; color-interpolation-filters: linearRGB; color-rendering: auto; color-scheme: auto; column-count: auto; column-fill: balance; column-gap: normal; column-rule-color: rgb(255, 0, 0); column-rule-style: none; column-rule-width: 0px; column-span: none; column-width: auto; content: ; counter-increment: none; counter-reset: none; cursor: auto; cx: 0px; cy: 0px; direction: ltr; display: block; dominant-baseline: auto; empty-cells: show; fill: rgb(0, 0, 0); fill-opacity: 1; fill-rule: nonzero; filter: none; flex-basis: auto; flex-direction: row; flex-grow: 0; flex-shrink: 1; flex-wrap: nowrap; float: none; flood-color: rgb(0, 0, 0); flood-opacity: 1; font-family: -webkit-standard; font-feature-settings: normal; font-optical-sizing: auto; font-size: 13.333333015441895px; font-stretch: normal; font-style: normal; font-synthesis: style weig
ht small-caps; font-variant-alternates: normal; font-variant-caps: normal; font-variant-east-asian: normal; font-variant-ligatures: normal; font-variant-numeric: normal; font-variant-position: normal; font-variation-settings: normal; font-weight: normal; glyph-orientation-horizontal: 0deg; glyph-orientation-vertical: auto; grid-auto-columns: auto; grid-auto-flow: row; grid-auto-rows: auto; grid-column-end: auto; grid-column-start: auto; grid-row-end: auto; grid-row-start: auto; grid-template-areas: none; grid-template-columns: none; grid-template-rows: none; hanging-punctuation: none; height: 0px; image-orientation: from-image; image-rendering: auto; inline-size: 784px; inset-block-end: auto; inset-block-start: auto; inset-inline-end: auto; inset-inline-start: auto; isolation: auto; justify-content: normal; justify-items: normal; justify-self: auto; kerning: 0; left: auto; letter-spacing: normal; lighting-color: rgb(255, 255, 255); line-break: auto; line-height: normal; list-style-i
mage: none; list-style-position: outside; list-style-type: disc; margin-block-end: 0px; margin-block-start: 0px; margin-bottom: 0px; margin-inline-end: 0px; margin-inline-start: 0px; margin-left: 0px; margin-right: 0px; margin-top: 0px; marker-end: none; marker-mid: none; marker-start: none; mask: none; mask-type: luminance; math-style: normal; max-block-size: none; max-height: none; max-inline-size: none; max-width: none; min-block-size: 0px; min-height: 0px; min-inline-size: 0px; min-width: 0px; mix-blend-mode: normal; object-fit: fill; object-position: 50% 50%; opacity: 1; order: 0; orphans: auto; outline-color: rgb(255, 0, 0); outline-offset: 0px; outline-style: none; outline-width: 0px; overflow-wrap: normal; overflow-x: visible; overflow-y: visible; padding-block-end: 0px; padding-block-start: 0px; padding-bottom: 0px; padding-inline-end: 0px; padding-inline-start: 0px; padding-left: 0px; padding-right: 0px; padding-top: 0px; page-break-after: auto; page-break-before: auto; pa
ge-break-inside: auto; paint-order: normal; perspective: none; perspective-origin-x: ; perspective-origin-y: ; pointer-events: auto; position: static; quotes: auto; r: 0px; resize: none; right: auto; rotate: none; row-gap: normal; rx: auto; ry: auto; scale: none; scroll-behavior: auto; scroll-margin-bottom: 0px; scroll-margin-left: 0px; scroll-margin-right: 0px; scroll-margin-top: 0px; scroll-padding-bottom: 0px; scroll-padding-left: 0px; scroll-padding-right: 0px; scroll-padding-top: 0px; scroll-snap-align: none none; scroll-snap-type: none; shape-image-threshold: 0; shape-margin: 0px; shape-outside: none; shape-rendering: auto; size: ; speak-as: normal; stop-color: rgb(0, 0, 0); stop-opacity: 1; stroke: none; stroke-color: rgba(0, 0, 0, 0); stroke-dasharray: none; stroke-dashoffset: 0px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-opacity: 1; stroke-width: 1px; tab-size: 8; table-layout: auto; text-align: start; text-anchor: start; text-decoration: n
one; text-decoration-color: rgb(255, 0, 0); text-decoration-line: none; text-decoration-skip: auto; text-decoration-style: solid; text-decoration-thickness: auto; text-indent: 0px; text-orientation: mixed; text-overflow: clip; text-rendering: auto; text-shadow: none; text-transform: none; text-underline-offset: auto; text-underline-position: auto; top: auto; touch-action: auto; transform: none; transform-box: view-box; transform-origin-x: ; transform-origin-y: ; transform-origin-z: ; transform-style: flat; transition-delay: 0s; transition-duration: 0s; transition-property: all; transition-timing-function: ease; translate: none; unicode-bidi: normal; vector-effect: none; vertical-align: baseline; visibility: visible; white-space: normal; widows: auto; width: 784px; will-change: auto; word-break: normal; word-spacing: 0px; word-wrap: normal; writing-mode: horizontal-tb; x: 0px; y: 0px; z-index: auto; zoom: 1; -apple-color-filter: none; -apple-pay-button-style: black; -apple-pay-button
-type: plain; -apple-trailing-word: auto; -webkit-appearance: none; -webkit-aspect-ratio: auto; -webkit-backdrop-filter: none; -webkit-backface-visibility: visible; -webkit-background-clip: border-box; -webkit-background-composite: source-over; -webkit-background-origin: padding-box; -webkit-background-size: auto; -webkit-border-fit: border; -webkit-border-horizontal-spacing: 0px; -webkit-border-image: none; -webkit-border-vertical-spacing: 0px; -webkit-box-align: stretch; -webkit-box-decoration-break: slice; -webkit-box-direction: normal; -webkit-box-flex: 0; -webkit-box-flex-group: 1; -webkit-box-lines: single; -webkit-box-ordinal-group: 1; -webkit-box-orient: horizontal; -webkit-box-pack: start; -webkit-box-reflect: none; -webkit-box-shadow: none; -webkit-column-axis: auto; -webkit-column-break-after: auto; -webkit-column-break-before: auto; -webkit-column-break-inside: auto; -webkit-column-progression: normal; -webkit-cursor-visibility: auto; -webkit-font-kerning: auto; -webkit-
font-smoothing: auto; -webkit-hyphenate-character: auto; -webkit-hyphenate-limit-after: auto; -webkit-hyphenate-limit-before: auto; -webkit-hyphenate-limit-lines: no-limit; -webkit-hyphens: manual; -webkit-initial-letter: normal; -webkit-line-align: none; -webkit-line-box-contain: block inline replaced; -webkit-line-clamp: none; -webkit-line-grid: none; -webkit-line-snap: none; -webkit-locale: auto; -webkit-margin-after-collapse: collapse; -webkit-margin-before-collapse: collapse; -webkit-margin-bottom-collapse: collapse; -webkit-margin-top-collapse: collapse; -webkit-mask-box-image: none; -webkit-mask-box-image-outset: 0px; -webkit-mask-box-image-repeat: stretch; -webkit-mask-box-image-slice: 0 fill; -webkit-mask-box-image-source: none; -webkit-mask-box-image-width: auto; -webkit-mask-clip: border-box; -webkit-mask-composite: source-over; -webkit-mask-image: none; -webkit-mask-origin: border-box; -webkit-mask-position-x: 0%; -webkit-mask-position-y: 0%; -webkit-mask-repeat: repeat;
-webkit-mask-size: auto; -webkit-mask-source-type: alpha; -webkit-nbsp-mode: normal; -webkit-print-color-adjust: economy; -webkit-rtl-ordering: logical; -webkit-ruby-position: before; -webkit-text-combine: none; -webkit-text-emphasis-color: rgb(255, 0, 0); -webkit-text-emphasis-position: over right; -webkit-text-emphasis-style: none; -webkit-text-fill-color: rgb(255, 0, 0); -webkit-text-orientation: mixed; -webkit-text-security: none; -webkit-text-size-adjust: auto; -webkit-text-stroke-color: rgb(255, 0, 0); -webkit-text-stroke-width: 0px; -webkit-text-zoom: normal; -webkit-transform-style: flat; -webkit-user-drag: auto; -webkit-user-modify: read-only; -webkit-user-select: text;"
Modified: trunk/LayoutTests/platform/ios-wk2/imported/w3c/web-platform-tests/css/cssom/cssstyledeclaration-csstext-expected.txt (268888 => 268889)
--- trunk/LayoutTests/platform/ios-wk2/imported/w3c/web-platform-tests/css/cssom/cssstyledeclaration-csstext-expected.txt 2020-10-22 20:29:18 UTC (rev 268888)
+++ trunk/LayoutTests/platform/ios-wk2/imported/w3c/web-platform-tests/css/cssom/cssstyledeclaration-csstext-expected.txt 2020-10-22 20:31:49 UTC (rev 268889)
@@ -7,5 +7,5 @@
PASS another cssText order (non-alphabetical order)
PASS whitespaces in value
PASS invalid property does not appear
-FAIL cssText on computed style declaration returns the empty string assert_equals: cssText is empty expected "" but got "align-content: normal; align-items: normal; align-self: auto; alignment-baseline: auto; all: ; alt: \"\"; animation-delay: 0s; animation-direction: normal; animation-duration: 0s; animation-fill-mode: none; animation-iteration-count: 1; animation-name: none; animation-play-state: running; animation-timing-function: ease; background-attachment: scroll; background-blend-mode: normal; background-clip: border-box; background-color: rgba(0, 0, 0, 0); background-image: none; background-origin: padding-box; background-position-x: 0%; background-position-y: 0%; background-repeat: repeat; background-size: auto; baseline-shift: baseline; block-size: 0px; border-block-end-color: rgb(255, 0, 0); border-block-end-style: none; border-block-end-width: 0px; border-block-start-color: rgb(255, 0, 0); border-block-start-style: none; border-block-
start-width: 0px; border-bottom-color: rgb(255, 0, 0); border-bottom-left-radius: 0px; border-bottom-right-radius: 0px; border-bottom-style: none; border-bottom-width: 0px; border-collapse: separate; border-image-outset: 0px; border-image-repeat: stretch; border-image-slice: 100%; border-image-source: none; border-image-width: 1; border-inline-end-color: rgb(255, 0, 0); border-inline-end-style: none; border-inline-end-width: 0px; border-inline-start-color: rgb(255, 0, 0); border-inline-start-style: none; border-inline-start-width: 0px; border-left-color: rgb(255, 0, 0); border-left-style: none; border-left-width: 0px; border-right-color: rgb(255, 0, 0); border-right-style: none; border-right-width: 0px; border-top-color: rgb(255, 0, 0); border-top-left-radius: 0px; border-top-right-radius: 0px; border-top-style: none; border-top-width: 0px; bottom: auto; box-shadow: none; box-sizing: content-box; break-after: auto; break-before: auto; break-inside: auto; buffered-rendering: auto; ca
ption-side: top; caret-color: rgb(255, 0, 0); clear: none; clip: auto; clip-path: none; clip-rule: nonzero; color: rgb(255, 0, 0); color-interpolation: sRGB; color-interpolation-filters: linearRGB; color-rendering: auto; color-scheme: auto; column-count: auto; column-fill: balance; column-gap: normal; column-rule-color: rgb(255, 0, 0); column-rule-style: none; column-rule-width: 0px; column-span: none; column-width: auto; content: ; counter-increment: none; counter-reset: none; cursor: auto; cx: 0px; cy: 0px; direction: ltr; display: block; dominant-baseline: auto; empty-cells: show; fill: rgb(0, 0, 0); fill-opacity: 1; fill-rule: nonzero; filter: none; flex-basis: auto; flex-direction: row; flex-grow: 0; flex-shrink: 1; flex-wrap: nowrap; float: none; flood-color: rgb(0, 0, 0); flood-opacity: 1; font-family: -webkit-standard; font-feature-settings: normal; font-optical-sizing: auto; font-size: 13.333333015441895px; font-stretch: normal; font-style: normal; font-synthesis: style wei
ght small-caps; font-variant-alternates: normal; font-variant-caps: normal; font-variant-east-asian: normal; font-variant-ligatures: normal; font-variant-numeric: normal; font-variant-position: normal; font-variation-settings: normal; font-weight: normal; glyph-orientation-horizontal: 0deg; glyph-orientation-vertical: auto; grid-auto-columns: auto; grid-auto-flow: row; grid-auto-rows: auto; grid-column-end: auto; grid-column-start: auto; grid-row-end: auto; grid-row-start: auto; grid-template-areas: none; grid-template-columns: none; grid-template-rows: none; hanging-punctuation: none; height: 0px; image-orientation: from-image; image-rendering: auto; inline-size: 784px; inset-block-end: auto; inset-block-start: auto; inset-inline-end: auto; inset-inline-start: auto; isolation: auto; justify-content: normal; justify-items: normal; justify-self: auto; kerning: 0; left: auto; letter-spacing: normal; lighting-color: rgb(255, 255, 255); line-break: auto; line-height: normal; list-style-
image: none; list-style-position: outside; list-style-type: disc; margin-block-end: 0px; margin-block-start: 0px; margin-bottom: 0px; margin-inline-end: 0px; margin-inline-start: 0px; margin-left: 0px; margin-right: 0px; margin-top: 0px; marker-end: none; marker-mid: none; marker-start: none; mask: none; mask-type: luminance; math-style: normal; max-block-size: none; max-height: none; max-inline-size: none; max-width: none; min-block-size: 0px; min-height: 0px; min-inline-size: 0px; min-width: 0px; mix-blend-mode: normal; object-fit: fill; object-position: 50% 50%; opacity: 1; order: 0; orphans: auto; outline-color: rgb(255, 0, 0); outline-offset: 0px; outline-style: none; outline-width: 0px; overflow-wrap: normal; overflow-x: visible; overflow-y: visible; padding-block-end: 0px; padding-block-start: 0px; padding-bottom: 0px; padding-inline-end: 0px; padding-inline-start: 0px; padding-left: 0px; padding-right: 0px; padding-top: 0px; page-break-after: auto; page-break-before: auto; p
age-break-inside: auto; paint-order: normal; perspective: none; perspective-origin-x: ; perspective-origin-y: ; pointer-events: auto; position: static; quotes: auto; r: 0px; resize: none; right: auto; rotate: none; row-gap: normal; rx: auto; ry: auto; scale: none; scroll-behavior: auto; scroll-padding-bottom: 0px; scroll-padding-left: 0px; scroll-padding-right: 0px; scroll-padding-top: 0px; scroll-snap-align: none none; scroll-snap-margin-bottom: 0px; scroll-snap-margin-left: 0px; scroll-snap-margin-right: 0px; scroll-snap-margin-top: 0px; scroll-snap-type: none; shape-image-threshold: 0; shape-margin: 0px; shape-outside: none; shape-rendering: auto; size: ; speak-as: normal; stop-color: rgb(0, 0, 0); stop-opacity: 1; stroke: none; stroke-color: rgba(0, 0, 0, 0); stroke-dasharray: none; stroke-dashoffset: 0px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-opacity: 1; stroke-width: 1px; tab-size: 8; table-layout: auto; text-align: start; text-anchor: star
t; text-decoration: none; text-decoration-color: rgb(255, 0, 0); text-decoration-line: none; text-decoration-skip: auto; text-decoration-style: solid; text-decoration-thickness: auto; text-indent: 0px; text-orientation: mixed; text-overflow: clip; text-rendering: auto; text-shadow: none; text-transform: none; text-underline-offset: auto; text-underline-position: auto; top: auto; touch-action: auto; transform: none; transform-box: view-box; transform-origin-x: ; transform-origin-y: ; transform-origin-z: ; transform-style: flat; transition-delay: 0s; transition-duration: 0s; transition-property: all; transition-timing-function: ease; translate: none; unicode-bidi: normal; vector-effect: none; vertical-align: baseline; visibility: visible; white-space: normal; widows: auto; width: 784px; will-change: auto; word-break: normal; word-spacing: 0px; word-wrap: normal; writing-mode: horizontal-tb; x: 0px; y: 0px; z-index: auto; zoom: 1; -apple-color-filter: none; -apple-pay-button-style: bla
ck; -apple-pay-button-type: plain; -apple-trailing-word: auto; -webkit-appearance: none; -webkit-aspect-ratio: auto; -webkit-backdrop-filter: none; -webkit-backface-visibility: visible; -webkit-background-clip: border-box; -webkit-background-composite: source-over; -webkit-background-origin: padding-box; -webkit-background-size: auto; -webkit-border-fit: border; -webkit-border-horizontal-spacing: 0px; -webkit-border-image: none; -webkit-border-vertical-spacing: 0px; -webkit-box-align: stretch; -webkit-box-decoration-break: slice; -webkit-box-direction: normal; -webkit-box-flex: 0; -webkit-box-flex-group: 1; -webkit-box-lines: single; -webkit-box-ordinal-group: 1; -webkit-box-orient: horizontal; -webkit-box-pack: start; -webkit-box-reflect: none; -webkit-box-shadow: none; -webkit-column-axis: auto; -webkit-column-break-after: auto; -webkit-column-break-before: auto; -webkit-column-break-inside: auto; -webkit-column-progression: normal; -webkit-cursor-visibility: auto; -webkit-font-ke
rning: auto; -webkit-font-smoothing: auto; -webkit-hyphenate-character: auto; -webkit-hyphenate-limit-after: auto; -webkit-hyphenate-limit-before: auto; -webkit-hyphenate-limit-lines: no-limit; -webkit-hyphens: manual; -webkit-initial-letter: normal; -webkit-line-align: none; -webkit-line-box-contain: block inline replaced; -webkit-line-clamp: none; -webkit-line-grid: none; -webkit-line-snap: none; -webkit-locale: auto; -webkit-margin-after-collapse: collapse; -webkit-margin-before-collapse: collapse; -webkit-margin-bottom-collapse: collapse; -webkit-margin-top-collapse: collapse; -webkit-mask-box-image: none; -webkit-mask-box-image-outset: 0px; -webkit-mask-box-image-repeat: stretch; -webkit-mask-box-image-slice: 0 fill; -webkit-mask-box-image-source: none; -webkit-mask-box-image-width: auto; -webkit-mask-clip: border-box; -webkit-mask-composite: source-over; -webkit-mask-image: none; -webkit-mask-origin: border-box; -webkit-mask-position-x: 0%; -webkit-mask-position-y: 0%; -webkit
-mask-repeat: repeat; -webkit-mask-size: auto; -webkit-mask-source-type: alpha; -webkit-nbsp-mode: normal; -webkit-overflow-scrolling: auto; -webkit-print-color-adjust: economy; -webkit-rtl-ordering: logical; -webkit-ruby-position: before; -webkit-text-combine: none; -webkit-text-emphasis-color: rgb(255, 0, 0); -webkit-text-emphasis-position: over right; -webkit-text-emphasis-style: none; -webkit-text-fill-color: rgb(255, 0, 0); -webkit-text-orientation: mixed; -webkit-text-security: none; -webkit-text-size-adjust: auto; -webkit-text-stroke-color: rgb(255, 0, 0); -webkit-text-stroke-width: 0px; -webkit-text-zoom: normal; -webkit-touch-callout: default; -webkit-transform-style: flat; -webkit-user-drag: auto; -webkit-user-modify: read-only; -webkit-user-select: text;"
+FAIL cssText on computed style declaration returns the empty string assert_equals: cssText is empty expected "" but got "align-content: normal; align-items: normal; align-self: auto; alignment-baseline: auto; all: ; alt: \"\"; animation-delay: 0s; animation-direction: normal; animation-duration: 0s; animation-fill-mode: none; animation-iteration-count: 1; animation-name: none; animation-play-state: running; animation-timing-function: ease; background-attachment: scroll; background-blend-mode: normal; background-clip: border-box; background-color: rgba(0, 0, 0, 0); background-image: none; background-origin: padding-box; background-position-x: 0%; background-position-y: 0%; background-repeat: repeat; background-size: auto; baseline-shift: baseline; block-size: 0px; border-block-end-color: rgb(255, 0, 0); border-block-end-style: none; border-block-end-width: 0px; border-block-start-color: rgb(255, 0, 0); border-block-start-style: none; border-block-s
tart-width: 0px; border-bottom-color: rgb(255, 0, 0); border-bottom-left-radius: 0px; border-bottom-right-radius: 0px; border-bottom-style: none; border-bottom-width: 0px; border-collapse: separate; border-image-outset: 0px; border-image-repeat: stretch; border-image-slice: 100%; border-image-source: none; border-image-width: 1; border-inline-end-color: rgb(255, 0, 0); border-inline-end-style: none; border-inline-end-width: 0px; border-inline-start-color: rgb(255, 0, 0); border-inline-start-style: none; border-inline-start-width: 0px; border-left-color: rgb(255, 0, 0); border-left-style: none; border-left-width: 0px; border-right-color: rgb(255, 0, 0); border-right-style: none; border-right-width: 0px; border-top-color: rgb(255, 0, 0); border-top-left-radius: 0px; border-top-right-radius: 0px; border-top-style: none; border-top-width: 0px; bottom: auto; box-shadow: none; box-sizing: content-box; break-after: auto; break-before: auto; break-inside: auto; buffered-rendering: auto; cap
tion-side: top; caret-color: rgb(255, 0, 0); clear: none; clip: auto; clip-path: none; clip-rule: nonzero; color: rgb(255, 0, 0); color-interpolation: sRGB; color-interpolation-filters: linearRGB; color-rendering: auto; color-scheme: auto; column-count: auto; column-fill: balance; column-gap: normal; column-rule-color: rgb(255, 0, 0); column-rule-style: none; column-rule-width: 0px; column-span: none; column-width: auto; content: ; counter-increment: none; counter-reset: none; cursor: auto; cx: 0px; cy: 0px; direction: ltr; display: block; dominant-baseline: auto; empty-cells: show; fill: rgb(0, 0, 0); fill-opacity: 1; fill-rule: nonzero; filter: none; flex-basis: auto; flex-direction: row; flex-grow: 0; flex-shrink: 1; flex-wrap: nowrap; float: none; flood-color: rgb(0, 0, 0); flood-opacity: 1; font-family: -webkit-standard; font-feature-settings: normal; font-optical-sizing: auto; font-size: 13.333333015441895px; font-stretch: normal; font-style: normal; font-synthesis: style weig
ht small-caps; font-variant-alternates: normal; font-variant-caps: normal; font-variant-east-asian: normal; font-variant-ligatures: normal; font-variant-numeric: normal; font-variant-position: normal; font-variation-settings: normal; font-weight: normal; glyph-orientation-horizontal: 0deg; glyph-orientation-vertical: auto; grid-auto-columns: auto; grid-auto-flow: row; grid-auto-rows: auto; grid-column-end: auto; grid-column-start: auto; grid-row-end: auto; grid-row-start: auto; grid-template-areas: none; grid-template-columns: none; grid-template-rows: none; hanging-punctuation: none; height: 0px; image-orientation: from-image; image-rendering: auto; inline-size: 784px; inset-block-end: auto; inset-block-start: auto; inset-inline-end: auto; inset-inline-start: auto; isolation: auto; justify-content: normal; justify-items: normal; justify-self: auto; kerning: 0; left: auto; letter-spacing: normal; lighting-color: rgb(255, 255, 255); line-break: auto; line-height: normal; list-style-i
mage: none; list-style-position: outside; list-style-type: disc; margin-block-end: 0px; margin-block-start: 0px; margin-bottom: 0px; margin-inline-end: 0px; margin-inline-start: 0px; margin-left: 0px; margin-right: 0px; margin-top: 0px; marker-end: none; marker-mid: none; marker-start: none; mask: none; mask-type: luminance; math-style: normal; max-block-size: none; max-height: none; max-inline-size: none; max-width: none; min-block-size: 0px; min-height: 0px; min-inline-size: 0px; min-width: 0px; mix-blend-mode: normal; object-fit: fill; object-position: 50% 50%; opacity: 1; order: 0; orphans: auto; outline-color: rgb(255, 0, 0); outline-offset: 0px; outline-style: none; outline-width: 0px; overflow-wrap: normal; overflow-x: visible; overflow-y: visible; padding-block-end: 0px; padding-block-start: 0px; padding-bottom: 0px; padding-inline-end: 0px; padding-inline-start: 0px; padding-left: 0px; padding-right: 0px; padding-top: 0px; page-break-after: auto; page-break-before: auto; pa
ge-break-inside: auto; paint-order: normal; perspective: none; perspective-origin-x: ; perspective-origin-y: ; pointer-events: auto; position: static; quotes: auto; r: 0px; resize: none; right: auto; rotate: none; row-gap: normal; rx: auto; ry: auto; scale: none; scroll-behavior: auto; scroll-margin-bottom: 0px; scroll-margin-left: 0px; scroll-margin-right: 0px; scroll-margin-top: 0px; scroll-padding-bottom: 0px; scroll-padding-left: 0px; scroll-padding-right: 0px; scroll-padding-top: 0px; scroll-snap-align: none none; scroll-snap-type: none; shape-image-threshold: 0; shape-margin: 0px; shape-outside: none; shape-rendering: auto; size: ; speak-as: normal; stop-color: rgb(0, 0, 0); stop-opacity: 1; stroke: none; stroke-color: rgba(0, 0, 0, 0); stroke-dasharray: none; stroke-dashoffset: 0px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-opacity: 1; stroke-width: 1px; tab-size: 8; table-layout: auto; text-align: start; text-anchor: start; text-decoration: n
one; text-decoration-color: rgb(255, 0, 0); text-decoration-line: none; text-decoration-skip: auto; text-decoration-style: solid; text-decoration-thickness: auto; text-indent: 0px; text-orientation: mixed; text-overflow: clip; text-rendering: auto; text-shadow: none; text-transform: none; text-underline-offset: auto; text-underline-position: auto; top: auto; touch-action: auto; transform: none; transform-box: view-box; transform-origin-x: ; transform-origin-y: ; transform-origin-z: ; transform-style: flat; transition-delay: 0s; transition-duration: 0s; transition-property: all; transition-timing-function: ease; translate: none; unicode-bidi: normal; vector-effect: none; vertical-align: baseline; visibility: visible; white-space: normal; widows: auto; width: 784px; will-change: auto; word-break: normal; word-spacing: 0px; word-wrap: normal; writing-mode: horizontal-tb; x: 0px; y: 0px; z-index: auto; zoom: 1; -apple-color-filter: none; -apple-pay-button-style: black; -apple-pay-button
-type: plain; -apple-trailing-word: auto; -webkit-appearance: none; -webkit-aspect-ratio: auto; -webkit-backdrop-filter: none; -webkit-backface-visibility: visible; -webkit-background-clip: border-box; -webkit-background-composite: source-over; -webkit-background-origin: padding-box; -webkit-background-size: auto; -webkit-border-fit: border; -webkit-border-horizontal-spacing: 0px; -webkit-border-image: none; -webkit-border-vertical-spacing: 0px; -webkit-box-align: stretch; -webkit-box-decoration-break: slice; -webkit-box-direction: normal; -webkit-box-flex: 0; -webkit-box-flex-group: 1; -webkit-box-lines: single; -webkit-box-ordinal-group: 1; -webkit-box-orient: horizontal; -webkit-box-pack: start; -webkit-box-reflect: none; -webkit-box-shadow: none; -webkit-column-axis: auto; -webkit-column-break-after: auto; -webkit-column-break-before: auto; -webkit-column-break-inside: auto; -webkit-column-progression: normal; -webkit-cursor-visibility: auto; -webkit-font-kerning: auto; -webkit-
font-smoothing: auto; -webkit-hyphenate-character: auto; -webkit-hyphenate-limit-after: auto; -webkit-hyphenate-limit-before: auto; -webkit-hyphenate-limit-lines: no-limit; -webkit-hyphens: manual; -webkit-initial-letter: normal; -webkit-line-align: none; -webkit-line-box-contain: block inline replaced; -webkit-line-clamp: none; -webkit-line-grid: none; -webkit-line-snap: none; -webkit-locale: auto; -webkit-margin-after-collapse: collapse; -webkit-margin-before-collapse: collapse; -webkit-margin-bottom-collapse: collapse; -webkit-margin-top-collapse: collapse; -webkit-mask-box-image: none; -webkit-mask-box-image-outset: 0px; -webkit-mask-box-image-repeat: stretch; -webkit-mask-box-image-slice: 0 fill; -webkit-mask-box-image-source: none; -webkit-mask-box-image-width: auto; -webkit-mask-clip: border-box; -webkit-mask-composite: source-over; -webkit-mask-image: none; -webkit-mask-origin: border-box; -webkit-mask-position-x: 0%; -webkit-mask-position-y: 0%; -webkit-mask-repeat: repeat;
-webkit-mask-size: auto; -webkit-mask-source-type: alpha; -webkit-nbsp-mode: normal; -webkit-overflow-scrolling: auto; -webkit-print-color-adjust: economy; -webkit-rtl-ordering: logical; -webkit-ruby-position: before; -webkit-text-combine: none; -webkit-text-emphasis-color: rgb(255, 0, 0); -webkit-text-emphasis-position: over right; -webkit-text-emphasis-style: none; -webkit-text-fill-color: rgb(255, 0, 0); -webkit-text-orientation: mixed; -webkit-text-security: none; -webkit-text-size-adjust: auto; -webkit-text-stroke-color: rgb(255, 0, 0); -webkit-text-stroke-width: 0px; -webkit-text-zoom: normal; -webkit-touch-callout: default; -webkit-transform-style: flat; -webkit-user-drag: auto; -webkit-user-modify: read-only; -webkit-user-select: text;"
Modified: trunk/Source/WebCore/ChangeLog (268888 => 268889)
--- trunk/Source/WebCore/ChangeLog 2020-10-22 20:29:18 UTC (rev 268888)
+++ trunk/Source/WebCore/ChangeLog 2020-10-22 20:31:49 UTC (rev 268889)
@@ -1,3 +1,51 @@
+2020-10-22 Martin Robinson <[email protected]>
+
+ Rename scroll-snap-margin to scroll-margin
+ https://bugs.webkit.org/show_bug.cgi?id=218075
+
+ Reviewed by Simon Fraser.
+
+ Rename scroll-snap-margin to scroll-margin while leaving scroll-snap-margin still
+ available as an alias for backward compatibility reasons.
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::valueForPropertyInStyle): Rename CSS property name.
+ * css/CSSProperties.json: Rename CSS property and add an alias to the old name.
+ * css/StyleProperties.cpp: Changes to reflect new name.
+ (WebCore::StyleProperties::getPropertyValue const): Ditto.
+ (WebCore::StyleProperties::asText const): Ditto.
+ * css/parser/CSSPropertyParser.cpp: Ditto.
+ (WebCore::CSSPropertyParser::parseSingleValue): Ditto.
+ (WebCore::CSSPropertyParser::parseShorthand): Ditto.
+ * page/scrolling/AxisScrollSnapOffsets.cpp: Ditto.
+ (WebCore::updateSnapOffsetsForScrollableArea): Ditto.
+ * rendering/style/RenderStyle.cpp: Ditto.
+ (WebCore::RenderStyle::scrollMargin const): Ditto.
+ (WebCore::RenderStyle::scrollMarginTop const): Ditto.
+ (WebCore::RenderStyle::scrollMarginBottom const): Ditto.
+ (WebCore::RenderStyle::scrollMarginLeft const): Ditto.
+ (WebCore::RenderStyle::scrollMarginRight const): Ditto.
+ (WebCore::RenderStyle::setScrollMarginTop): Ditto.
+ (WebCore::RenderStyle::setScrollMarginBottom): Ditto.
+ (WebCore::RenderStyle::setScrollMarginLeft): Ditto.
+ (WebCore::RenderStyle::setScrollMarginRight): Ditto.
+ (WebCore::RenderStyle::scrollSnapMargin const): Deleted.
+ (WebCore::RenderStyle::scrollSnapMarginTop const): Deleted.
+ (WebCore::RenderStyle::scrollSnapMarginBottom const): Deleted.
+ (WebCore::RenderStyle::scrollSnapMarginLeft const): Deleted.
+ (WebCore::RenderStyle::scrollSnapMarginRight const): Deleted.
+ (WebCore::RenderStyle::setScrollSnapMarginTop): Deleted.
+ (WebCore::RenderStyle::setScrollSnapMarginBottom): Deleted.
+ (WebCore::RenderStyle::setScrollSnapMarginLeft): Deleted.
+ (WebCore::RenderStyle::setScrollSnapMarginRight): Deleted.
+ * rendering/style/RenderStyle.h:
+ (WebCore::RenderStyle::initialScrollMargin): Added to reflect new name.
+ (WebCore::RenderStyle::initialScrollSnapMargin): Deleted.
+ * rendering/style/StyleScrollSnapPoints.cpp: Changes to reflect new name.
+ (WebCore::StyleScrollSnapArea::StyleScrollSnapArea): Ditto.
+ * rendering/style/StyleScrollSnapPoints.h: Ditto.
+ (WebCore::operator==): Ditto.
+
2020-10-22 Noam Rosenthal <[email protected]>
Support EXIF image resolution in CoreGraphics (macOS/iOS)
Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (268888 => 268889)
--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2020-10-22 20:29:18 UTC (rev 268888)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2020-10-22 20:31:49 UTC (rev 268889)
@@ -3795,16 +3795,16 @@
case CSSPropertyPaddingInline:
return getCSSPropertyValuesFor2SidesShorthand(paddingInlineShorthand());
#if ENABLE(CSS_SCROLL_SNAP)
- case CSSPropertyScrollSnapMargin:
- return getCSSPropertyValuesFor4SidesShorthand(scrollSnapMarginShorthand());
- case CSSPropertyScrollSnapMarginBottom:
- return zoomAdjustedPixelValueForLength(style.scrollSnapMarginBottom(), style);
- case CSSPropertyScrollSnapMarginTop:
- return zoomAdjustedPixelValueForLength(style.scrollSnapMarginTop(), style);
- case CSSPropertyScrollSnapMarginRight:
- return zoomAdjustedPixelValueForLength(style.scrollSnapMarginRight(), style);
- case CSSPropertyScrollSnapMarginLeft:
- return zoomAdjustedPixelValueForLength(style.scrollSnapMarginLeft(), style);
+ case CSSPropertyScrollMargin:
+ return getCSSPropertyValuesFor4SidesShorthand(scrollMarginShorthand());
+ case CSSPropertyScrollMarginBottom:
+ return zoomAdjustedPixelValueForLength(style.scrollMarginBottom(), style);
+ case CSSPropertyScrollMarginTop:
+ return zoomAdjustedPixelValueForLength(style.scrollMarginTop(), style);
+ case CSSPropertyScrollMarginRight:
+ return zoomAdjustedPixelValueForLength(style.scrollMarginRight(), style);
+ case CSSPropertyScrollMarginLeft:
+ return zoomAdjustedPixelValueForLength(style.scrollMarginLeft(), style);
case CSSPropertyScrollPadding:
return getCSSPropertyValuesFor4SidesShorthand(scrollPaddingShorthand());
case CSSPropertyScrollPaddingBottom:
Modified: trunk/Source/WebCore/css/CSSProperties.json (268888 => 268889)
--- trunk/Source/WebCore/css/CSSProperties.json 2020-10-22 20:29:18 UTC (rev 268888)
+++ trunk/Source/WebCore/css/CSSProperties.json 2020-10-22 20:31:49 UTC (rev 268889)
@@ -6555,6 +6555,80 @@
"url": "https://drafts.csswg.org/cssom-view/#propdef-scroll-behavior"
}
},
+ "scroll-margin": {
+ "codegen-properties": {
+ "enable-if": "ENABLE_CSS_SCROLL_SNAP",
+ "longhands": [
+ "scroll-margin-top",
+ "scroll-margin-right",
+ "scroll-margin-bottom",
+ "scroll-margin-left"
+ ],
+ "aliases": [
+ "scroll-snap-margin"
+ ]
+ },
+ "specification": {
+ "category": "css-scroll-snap",
+ "url": "https://www.w3.org/TR/css-scroll-snap-1/#propdef-scroll-margin"
+ }
+ },
+ "scroll-margin-bottom": {
+ "codegen-properties": {
+ "enable-if": "ENABLE_CSS_SCROLL_SNAP",
+ "initial": "initialScrollMargin",
+ "converter": "Length",
+ "aliases": [
+ "scroll-snap-margin-bottom"
+ ]
+ },
+ "specification": {
+ "category": "css-scroll-snap",
+ "url": "https://www.w3.org/TR/css-scroll-snap-1/#propdef-scroll-margin"
+ }
+ },
+ "scroll-margin-left": {
+ "codegen-properties": {
+ "enable-if": "ENABLE_CSS_SCROLL_SNAP",
+ "initial": "initialScrollMargin",
+ "converter": "Length",
+ "aliases": [
+ "scroll-snap-margin-left"
+ ]
+ },
+ "specification": {
+ "category": "css-scroll-snap",
+ "url": "https://www.w3.org/TR/css-scroll-snap-1/#propdef-scroll-margin"
+ }
+ },
+ "scroll-margin-right": {
+ "codegen-properties": {
+ "enable-if": "ENABLE_CSS_SCROLL_SNAP",
+ "initial": "initialScrollMargin",
+ "converter": "Length",
+ "aliases": [
+ "scroll-snap-margin-right"
+ ]
+ },
+ "specification": {
+ "category": "css-scroll-snap",
+ "url": "https://www.w3.org/TR/css-scroll-snap-1/#propdef-scroll-margin"
+ }
+ },
+ "scroll-margin-top": {
+ "codegen-properties": {
+ "enable-if": "ENABLE_CSS_SCROLL_SNAP",
+ "initial": "initialScrollMargin",
+ "converter": "Length",
+ "aliases": [
+ "scroll-snap-margin-top"
+ ]
+ },
+ "specification": {
+ "category": "css-scroll-snap",
+ "url": "https://www.w3.org/TR/css-scroll-snap-1/#propdef-scroll-margin"
+ }
+ },
"scroll-padding": {
"codegen-properties": {
"enable-if": "ENABLE_CSS_SCROLL_SNAP",
@@ -6710,65 +6784,6 @@
"url": "https://www.w3.org/TR/css-scroll-snap-1/#propdef-scroll-padding"
}
},
- "scroll-snap-margin": {
- "codegen-properties": {
- "enable-if": "ENABLE_CSS_SCROLL_SNAP",
- "longhands": [
- "scroll-snap-margin-top",
- "scroll-snap-margin-right",
- "scroll-snap-margin-bottom",
- "scroll-snap-margin-left"
- ]
- },
- "specification": {
- "category": "css-scroll-snap",
- "url": "https://www.w3.org/TR/css-scroll-snap-1/#propdef-scroll-padding"
- }
- },
- "scroll-snap-margin-bottom": {
- "codegen-properties": {
- "enable-if": "ENABLE_CSS_SCROLL_SNAP",
- "initial": "initialScrollSnapMargin",
- "converter": "Length"
- },
- "specification": {
- "category": "css-scroll-snap",
- "url": "https://www.w3.org/TR/css-scroll-snap-1/#propdef-scroll-padding"
- }
- },
- "scroll-snap-margin-left": {
- "codegen-properties": {
- "enable-if": "ENABLE_CSS_SCROLL_SNAP",
- "initial": "initialScrollSnapMargin",
- "converter": "Length"
- },
- "specification": {
- "category": "css-scroll-snap",
- "url": "https://www.w3.org/TR/css-scroll-snap-1/#propdef-scroll-padding"
- }
- },
- "scroll-snap-margin-right": {
- "codegen-properties": {
- "enable-if": "ENABLE_CSS_SCROLL_SNAP",
- "initial": "initialScrollSnapMargin",
- "converter": "Length"
- },
- "specification": {
- "category": "css-scroll-snap",
- "url": "https://www.w3.org/TR/css-scroll-snap-1/#propdef-scroll-padding"
- }
- },
- "scroll-snap-margin-top": {
- "codegen-properties": {
- "enable-if": "ENABLE_CSS_SCROLL_SNAP",
- "initial": "initialScrollSnapMargin",
- "converter": "Length"
- },
- "specification": {
- "category": "css-scroll-snap",
- "url": "https://www.w3.org/TR/css-scroll-snap-1/#propdef-scroll-padding"
- }
- },
"scroll-snap-type": {
"codegen-properties": {
"converter": "ScrollSnapType",
Modified: trunk/Source/WebCore/css/StyleProperties.cpp (268888 => 268889)
--- trunk/Source/WebCore/css/StyleProperties.cpp 2020-10-22 20:29:18 UTC (rev 268888)
+++ trunk/Source/WebCore/css/StyleProperties.cpp 2020-10-22 20:31:49 UTC (rev 268889)
@@ -286,8 +286,8 @@
case CSSPropertyGap:
return get2Values(gapShorthand());
#if ENABLE(CSS_SCROLL_SNAP)
- case CSSPropertyScrollSnapMargin:
- return get4Values(scrollSnapMarginShorthand());
+ case CSSPropertyScrollMargin:
+ return get4Values(scrollMarginShorthand());
case CSSPropertyScrollPadding:
return get4Values(scrollPaddingShorthand());
#endif
@@ -1175,11 +1175,11 @@
case CSSPropertyScrollPaddingLeft:
shorthandPropertyID = CSSPropertyScrollPadding;
break;
- case CSSPropertyScrollSnapMarginTop:
- case CSSPropertyScrollSnapMarginRight:
- case CSSPropertyScrollSnapMarginBottom:
- case CSSPropertyScrollSnapMarginLeft:
- shorthandPropertyID = CSSPropertyScrollSnapMargin;
+ case CSSPropertyScrollMarginTop:
+ case CSSPropertyScrollMarginRight:
+ case CSSPropertyScrollMarginBottom:
+ case CSSPropertyScrollMarginLeft:
+ shorthandPropertyID = CSSPropertyScrollMargin;
break;
#endif
case CSSPropertyTransitionProperty:
Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (268888 => 268889)
--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2020-10-22 20:29:18 UTC (rev 268888)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2020-10-22 20:31:49 UTC (rev 268889)
@@ -4142,10 +4142,10 @@
case CSSPropertyPaddingBlockEnd:
return consumeLengthOrPercent(m_range, m_context.mode, ValueRangeNonNegative, UnitlessQuirk::Forbid);
#if ENABLE(CSS_SCROLL_SNAP)
- case CSSPropertyScrollSnapMarginBottom:
- case CSSPropertyScrollSnapMarginLeft:
- case CSSPropertyScrollSnapMarginRight:
- case CSSPropertyScrollSnapMarginTop:
+ case CSSPropertyScrollMarginBottom:
+ case CSSPropertyScrollMarginLeft:
+ case CSSPropertyScrollMarginRight:
+ case CSSPropertyScrollMarginTop:
return consumeLength(m_range, m_context.mode, ValueRangeAll);
case CSSPropertyScrollPaddingBottom:
case CSSPropertyScrollPaddingLeft:
@@ -5825,8 +5825,8 @@
case CSSPropertyPaddingInline:
return consume2ValueShorthand(paddingInlineShorthand(), important);
#if ENABLE(CSS_SCROLL_SNAP)
- case CSSPropertyScrollSnapMargin:
- return consume4ValueShorthand(scrollSnapMarginShorthand(), important);
+ case CSSPropertyScrollMargin:
+ return consume4ValueShorthand(scrollMarginShorthand(), important);
case CSSPropertyScrollPadding:
return consume4ValueShorthand(scrollPaddingShorthand(), important);
#endif
Modified: trunk/Source/WebCore/page/scrolling/AxisScrollSnapOffsets.cpp (268888 => 268889)
--- trunk/Source/WebCore/page/scrolling/AxisScrollSnapOffsets.cpp 2020-10-22 20:29:18 UTC (rev 268888)
+++ trunk/Source/WebCore/page/scrolling/AxisScrollSnapOffsets.cpp 2020-10-22 20:31:49 UTC (rev 268889)
@@ -200,7 +200,7 @@
if (!scrollableArea.isScrollView())
scrollSnapArea.moveBy(scrollPosition);
- scrollSnapArea = computeScrollSnapPortOrAreaRect(scrollSnapArea, child->style().scrollSnapMargin(), InsetOrOutset::Outset);
+ scrollSnapArea = computeScrollSnapPortOrAreaRect(scrollSnapArea, child->style().scrollMargin(), InsetOrOutset::Outset);
LOG_WITH_STREAM(ScrollSnap, stream << " Considering scroll snap target area " << scrollSnapArea);
auto alignment = child->style().scrollSnapAlign();
if (hasHorizontalSnapOffsets && alignment.x != ScrollSnapAxisAlignType::None) {
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (268888 => 268889)
--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2020-10-22 20:29:18 UTC (rev 268888)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2020-10-22 20:31:49 UTC (rev 268889)
@@ -2449,29 +2449,29 @@
return m_rareNonInheritedData->scrollSnapArea->alignment;
}
-const LengthBox& RenderStyle::scrollSnapMargin() const
+const LengthBox& RenderStyle::scrollMargin() const
{
- return m_rareNonInheritedData->scrollSnapArea->scrollSnapMargin;
+ return m_rareNonInheritedData->scrollSnapArea->scrollMargin;
}
-const Length& RenderStyle::scrollSnapMarginTop() const
+const Length& RenderStyle::scrollMarginTop() const
{
- return scrollSnapMargin().top();
+ return scrollMargin().top();
}
-const Length& RenderStyle::scrollSnapMarginBottom() const
+const Length& RenderStyle::scrollMarginBottom() const
{
- return scrollSnapMargin().bottom();
+ return scrollMargin().bottom();
}
-const Length& RenderStyle::scrollSnapMarginLeft() const
+const Length& RenderStyle::scrollMarginLeft() const
{
- return scrollSnapMargin().left();
+ return scrollMargin().left();
}
-const Length& RenderStyle::scrollSnapMarginRight() const
+const Length& RenderStyle::scrollMarginRight() const
{
- return scrollSnapMargin().right();
+ return scrollMargin().right();
}
void RenderStyle::setScrollSnapType(const ScrollSnapType& type)
@@ -2504,24 +2504,24 @@
SET_NESTED_VAR(m_rareNonInheritedData, scrollSnapArea, alignment, alignment);
}
-void RenderStyle::setScrollSnapMarginTop(Length&& length)
+void RenderStyle::setScrollMarginTop(Length&& length)
{
- SET_NESTED_VAR(m_rareNonInheritedData, scrollSnapArea, scrollSnapMargin.top(), WTFMove(length));
+ SET_NESTED_VAR(m_rareNonInheritedData, scrollSnapArea, scrollMargin.top(), WTFMove(length));
}
-void RenderStyle::setScrollSnapMarginBottom(Length&& length)
+void RenderStyle::setScrollMarginBottom(Length&& length)
{
- SET_NESTED_VAR(m_rareNonInheritedData, scrollSnapArea, scrollSnapMargin.bottom(), WTFMove(length));
+ SET_NESTED_VAR(m_rareNonInheritedData, scrollSnapArea, scrollMargin.bottom(), WTFMove(length));
}
-void RenderStyle::setScrollSnapMarginLeft(Length&& length)
+void RenderStyle::setScrollMarginLeft(Length&& length)
{
- SET_NESTED_VAR(m_rareNonInheritedData, scrollSnapArea, scrollSnapMargin.left(), WTFMove(length));
+ SET_NESTED_VAR(m_rareNonInheritedData, scrollSnapArea, scrollMargin.left(), WTFMove(length));
}
-void RenderStyle::setScrollSnapMarginRight(Length&& length)
+void RenderStyle::setScrollMarginRight(Length&& length)
{
- SET_NESTED_VAR(m_rareNonInheritedData, scrollSnapArea, scrollSnapMargin.right(), WTFMove(length));
+ SET_NESTED_VAR(m_rareNonInheritedData, scrollSnapArea, scrollMargin.right(), WTFMove(length));
}
#endif
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (268888 => 268889)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2020-10-22 20:29:18 UTC (rev 268888)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2020-10-22 20:31:49 UTC (rev 268889)
@@ -732,11 +732,11 @@
// Scroll snap area style.
const StyleScrollSnapArea& scrollSnapArea() const;
const ScrollSnapAlign& scrollSnapAlign() const;
- const LengthBox& scrollSnapMargin() const;
- const Length& scrollSnapMarginTop() const;
- const Length& scrollSnapMarginBottom() const;
- const Length& scrollSnapMarginLeft() const;
- const Length& scrollSnapMarginRight() const;
+ const LengthBox& scrollMargin() const;
+ const Length& scrollMarginTop() const;
+ const Length& scrollMarginBottom() const;
+ const Length& scrollMarginLeft() const;
+ const Length& scrollMarginRight() const;
#endif
#if ENABLE(TOUCH_EVENTS)
@@ -1273,10 +1273,10 @@
void setScrollPaddingRight(Length&&);
void setScrollSnapAlign(const ScrollSnapAlign&);
- void setScrollSnapMarginTop(Length&&);
- void setScrollSnapMarginBottom(Length&&);
- void setScrollSnapMarginLeft(Length&&);
- void setScrollSnapMarginRight(Length&&);
+ void setScrollMarginTop(Length&&);
+ void setScrollMarginBottom(Length&&);
+ void setScrollMarginLeft(Length&&);
+ void setScrollMarginRight(Length&&);
#endif
#if ENABLE(TOUCH_EVENTS)
@@ -1677,7 +1677,7 @@
#if ENABLE(CSS_SCROLL_SNAP)
static ScrollSnapType initialScrollSnapType();
static ScrollSnapAlign initialScrollSnapAlign();
- static Length initialScrollSnapMargin() { return Length(Fixed); }
+ static Length initialScrollMargin() { return Length(Fixed); }
static Length initialScrollPadding() { return Length(Fixed); }
#endif
Modified: trunk/Source/WebCore/rendering/style/StyleScrollSnapPoints.cpp (268888 => 268889)
--- trunk/Source/WebCore/rendering/style/StyleScrollSnapPoints.cpp 2020-10-22 20:29:18 UTC (rev 268888)
+++ trunk/Source/WebCore/rendering/style/StyleScrollSnapPoints.cpp 2020-10-22 20:31:49 UTC (rev 268889)
@@ -52,7 +52,7 @@
}
StyleScrollSnapArea::StyleScrollSnapArea()
- : scrollSnapMargin(0, 0, 0, 0)
+ : scrollMargin(0, 0, 0, 0)
{
}
@@ -59,7 +59,7 @@
inline StyleScrollSnapArea::StyleScrollSnapArea(const StyleScrollSnapArea& other)
: RefCounted()
, alignment(other.alignment)
- , scrollSnapMargin(other.scrollSnapMargin)
+ , scrollMargin(other.scrollMargin)
{
}
Modified: trunk/Source/WebCore/rendering/style/StyleScrollSnapPoints.h (268888 => 268889)
--- trunk/Source/WebCore/rendering/style/StyleScrollSnapPoints.h 2020-10-22 20:29:18 UTC (rev 268888)
+++ trunk/Source/WebCore/rendering/style/StyleScrollSnapPoints.h 2020-10-22 20:31:49 UTC (rev 268889)
@@ -86,7 +86,7 @@
bool hasSnapPosition() const { return alignment.x != ScrollSnapAxisAlignType::None || alignment.y != ScrollSnapAxisAlignType::None; }
ScrollSnapAlign alignment;
- LengthBox scrollSnapMargin { 0, 0, 0, 0 };
+ LengthBox scrollMargin { 0, 0, 0, 0 };
private:
StyleScrollSnapArea();
@@ -95,7 +95,7 @@
inline bool operator==(const StyleScrollSnapArea& a, const StyleScrollSnapArea& b)
{
- return a.alignment == b.alignment && a.scrollSnapMargin == b.scrollSnapMargin;
+ return a.alignment == b.alignment && a.scrollMargin == b.scrollMargin;
}
inline bool operator!=(const StyleScrollSnapArea& a, const StyleScrollSnapArea& b) { return !(a == b); }
