⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 268889 in webkit


Ignore:
Timestamp:
Oct 22, 2020, 1:31:49 PM (6 years ago)
Author:
commit-queue@webkit.org
Message:

Rename scroll-snap-margin to scroll-margin
​https://bugs.webkit.org/show_bug.cgi?id=218075

Patch by Martin Robinson <​mrobinson@igalia.com> on 2020-10-22
Reviewed by Simon Fraser.

LayoutTests/imported/w3c:

  • 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.

Source/WebCore:

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.

LayoutTests:

  • platform/ios-wk2/imported/w3c/web-platform-tests/css/cssom/cssstyledeclaration-csstext-expected.txt: Update results for this test.
Location:
trunk
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r268886 r268889  
     12020-10-22  Martin Robinson  <mrobinson@igalia.com>
     2
     3        Rename scroll-snap-margin to scroll-margin
     4        https://bugs.webkit.org/show_bug.cgi?id=218075
     5
     6        Reviewed by Simon Fraser.
     7
     8        * platform/ios-wk2/imported/w3c/web-platform-tests/css/cssom/cssstyledeclaration-csstext-expected.txt: Update results for this test.
     9
    1102020-10-22  Noam Rosenthal  <noam@webkit.org>
    211

  • trunk/LayoutTests/imported/w3c/ChangeLog

    r268886 r268889  
     12020-10-22  Martin Robinson  <mrobinson@igalia.com>
     2
     3        Rename scroll-snap-margin to scroll-margin
     4        https://bugs.webkit.org/show_bug.cgi?id=218075
     5
     6        Reviewed by Simon Fraser.
     7
     8        * web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt: Update result for newly passing test.
     9        * web-platform-tests/css/css-scroll-snap/inheritance-expected.txt: Ditto
     10        * web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-computed-expected.txt: Ditto.
     11        * web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-shorthand-expected.txt: Ditto.
     12        * web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-valid-expected.txt: Ditto.
     13        * web-platform-tests/css/cssom/cssstyledeclaration-csstext-expected.txt: Ditto.
     14
    1152020-10-22  Noam Rosenthal  <noam@webkit.org>
    216

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt

    r267985 r268889  
    222222PASS scale
    223223PASS scroll-behavior
     224PASS scroll-margin-bottom
     225PASS scroll-margin-left
     226PASS scroll-margin-right
     227PASS scroll-margin-top
    224228PASS scroll-padding-bottom
    225229PASS scroll-padding-left
    … …  
    227231PASS scroll-padding-top
    228232PASS scroll-snap-align
    229 PASS scroll-snap-margin-bottom
    230 PASS scroll-snap-margin-left
    231 PASS scroll-snap-margin-right
    232 PASS scroll-snap-margin-top
    233233PASS scroll-snap-type
    234234PASS shape-image-threshold

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-scroll-snap/inheritance-expected.txt

    r268348 r268889  
    44FAIL 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
    55FAIL Property scroll-margin-block-start does not inherit assert_true: expected true got false
    6 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
    7 FAIL Property scroll-margin-bottom does not inherit assert_true: expected true got false
     6PASS Property scroll-margin-bottom has initial value 0px
     7PASS Property scroll-margin-bottom does not inherit
    88FAIL 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
    99FAIL Property scroll-margin-inline-end does not inherit assert_true: expected true got false
    1010FAIL 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
    1111FAIL Property scroll-margin-inline-start does not inherit assert_true: expected true got false
    12 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
    13 FAIL Property scroll-margin-left does not inherit assert_true: expected true got false
    14 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
    15 FAIL Property scroll-margin-right does not inherit assert_true: expected true got false
    16 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
    17 FAIL Property scroll-margin-top does not inherit assert_true: expected true got false
     12PASS Property scroll-margin-left has initial value 0px
     13PASS Property scroll-margin-left does not inherit
     14PASS Property scroll-margin-right has initial value 0px
     15PASS Property scroll-margin-right does not inherit
     16PASS Property scroll-margin-top has initial value 0px
     17PASS Property scroll-margin-top does not inherit
    1818FAIL 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
    1919FAIL Property scroll-padding-block-end does not inherit assert_true: expected true got false

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-computed-expected.txt

    r268250 r268889  
    11
    2 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
    3 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
    4 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
    5 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
    6 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
    7 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
    8 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
    9 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
    10 FAIL Property scroll-margin value '10px' assert_true: scroll-margin doesn't seem to be supported in the computed style expected true got false
    11 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
    12 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
     2PASS Property scroll-margin-top value '10px'
     3PASS Property scroll-margin-top value 'calc(10px - 0.5em)'
     4PASS Property scroll-margin-right value '10px'
     5PASS Property scroll-margin-right value 'calc(10px - 0.5em)'
     6PASS Property scroll-margin-bottom value '10px'
     7PASS Property scroll-margin-bottom value 'calc(10px - 0.5em)'
     8PASS Property scroll-margin-left value '10px'
     9PASS Property scroll-margin-left value 'calc(10px - 0.5em)'
     10PASS Property scroll-margin value '10px'
     11PASS Property scroll-margin value 'calc(10px - 0.5em)'
     12PASS Property scroll-margin value '1px 2px'
    1313

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-shorthand-expected.txt

    r268250 r268889  
    11
    2 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
    3 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
    4 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
    5 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
    6 FAIL e.style['scroll-margin'] = "10px" should not set unrelated longhands assert_true: expected true got false
    7 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
    8 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
    9 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
    10 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
    11 FAIL e.style['scroll-margin'] = "30px 20px" should not set unrelated longhands assert_true: expected true got false
    12 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
    13 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
    14 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
    15 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
    16 FAIL e.style['scroll-margin'] = "1px 2px 3px" should not set unrelated longhands assert_true: expected true got false
    17 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
    18 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
    19 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
    20 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
    21 FAIL e.style['scroll-margin'] = "-1px 2px 3px 0" should not set unrelated longhands assert_true: expected true got false
     2PASS e.style['scroll-margin'] = "10px" should set scroll-margin-bottom
     3PASS e.style['scroll-margin'] = "10px" should set scroll-margin-left
     4PASS e.style['scroll-margin'] = "10px" should set scroll-margin-right
     5PASS e.style['scroll-margin'] = "10px" should set scroll-margin-top
     6PASS e.style['scroll-margin'] = "10px" should not set unrelated longhands
     7PASS e.style['scroll-margin'] = "30px 20px" should set scroll-margin-bottom
     8PASS e.style['scroll-margin'] = "30px 20px" should set scroll-margin-left
     9PASS e.style['scroll-margin'] = "30px 20px" should set scroll-margin-right
     10PASS e.style['scroll-margin'] = "30px 20px" should set scroll-margin-top
     11PASS e.style['scroll-margin'] = "30px 20px" should not set unrelated longhands
     12PASS e.style['scroll-margin'] = "1px 2px 3px" should set scroll-margin-bottom
     13PASS e.style['scroll-margin'] = "1px 2px 3px" should set scroll-margin-left
     14PASS e.style['scroll-margin'] = "1px 2px 3px" should set scroll-margin-right
     15PASS e.style['scroll-margin'] = "1px 2px 3px" should set scroll-margin-top
     16PASS e.style['scroll-margin'] = "1px 2px 3px" should not set unrelated longhands
     17PASS e.style['scroll-margin'] = "-1px 2px 3px 0" should set scroll-margin-bottom
     18PASS e.style['scroll-margin'] = "-1px 2px 3px 0" should set scroll-margin-left
     19PASS e.style['scroll-margin'] = "-1px 2px 3px 0" should set scroll-margin-right
     20PASS e.style['scroll-margin'] = "-1px 2px 3px 0" should set scroll-margin-top
     21PASS e.style['scroll-margin'] = "-1px 2px 3px 0" should not set unrelated longhands
    2222

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-valid-expected.txt

    r268250 r268889  
    11
    2 FAIL e.style['scroll-margin-top'] = "0" should set the property value assert_not_equals: property should be set got disallowed value ""
    3 FAIL e.style['scroll-margin-top'] = "-10px" should set the property value assert_not_equals: property should be set got disallowed value ""
    4 FAIL e.style['scroll-margin-top'] = "calc(2em + 3ex)" should set the property value assert_not_equals: property should be set got disallowed value ""
    5 FAIL e.style['scroll-margin-right'] = "0" should set the property value assert_not_equals: property should be set got disallowed value ""
    6 FAIL e.style['scroll-margin-right'] = "-10px" should set the property value assert_not_equals: property should be set got disallowed value ""
    7 FAIL e.style['scroll-margin-right'] = "calc(2em + 3ex)" should set the property value assert_not_equals: property should be set got disallowed value ""
    8 FAIL e.style['scroll-margin-bottom'] = "0" should set the property value assert_not_equals: property should be set got disallowed value ""
    9 FAIL e.style['scroll-margin-bottom'] = "-10px" should set the property value assert_not_equals: property should be set got disallowed value ""
    10 FAIL e.style['scroll-margin-bottom'] = "calc(2em + 3ex)" should set the property value assert_not_equals: property should be set got disallowed value ""
    11 FAIL e.style['scroll-margin-left'] = "0" should set the property value assert_not_equals: property should be set got disallowed value ""
    12 FAIL e.style['scroll-margin-left'] = "-10px" should set the property value assert_not_equals: property should be set got disallowed value ""
    13 FAIL e.style['scroll-margin-left'] = "calc(2em + 3ex)" should set the property value assert_not_equals: property should be set got disallowed value ""
    14 FAIL e.style['scroll-margin'] = "0" should set the property value assert_not_equals: property should be set got disallowed value ""
    15 FAIL e.style['scroll-margin'] = "-10px" should set the property value assert_not_equals: property should be set got disallowed value ""
    16 FAIL e.style['scroll-margin'] = "calc(2em + 3ex)" should set the property value assert_not_equals: property should be set got disallowed value ""
    17 FAIL e.style['scroll-margin'] = "1px 2px" should set the property value assert_not_equals: property should be set got disallowed value ""
    18 FAIL e.style['scroll-margin'] = "1px 2px 3px" should set the property value assert_not_equals: property should be set got disallowed value ""
    19 FAIL e.style['scroll-margin'] = "1px 2px 3px 4px" should set the property value assert_not_equals: property should be set got disallowed value ""
    20 FAIL e.style['scroll-margin'] = "0 0 0 0" should set the property value assert_not_equals: property should be set got disallowed value ""
     2PASS e.style['scroll-margin-top'] = "0" should set the property value
     3PASS e.style['scroll-margin-top'] = "-10px" should set the property value
     4PASS e.style['scroll-margin-top'] = "calc(2em + 3ex)" should set the property value
     5PASS e.style['scroll-margin-right'] = "0" should set the property value
     6PASS e.style['scroll-margin-right'] = "-10px" should set the property value
     7PASS e.style['scroll-margin-right'] = "calc(2em + 3ex)" should set the property value
     8PASS e.style['scroll-margin-bottom'] = "0" should set the property value
     9PASS e.style['scroll-margin-bottom'] = "-10px" should set the property value
     10PASS e.style['scroll-margin-bottom'] = "calc(2em + 3ex)" should set the property value
     11PASS e.style['scroll-margin-left'] = "0" should set the property value
     12PASS e.style['scroll-margin-left'] = "-10px" should set the property value
     13PASS e.style['scroll-margin-left'] = "calc(2em + 3ex)" should set the property value
     14PASS e.style['scroll-margin'] = "0" should set the property value
     15PASS e.style['scroll-margin'] = "-10px" should set the property value
     16PASS e.style['scroll-margin'] = "calc(2em + 3ex)" should set the property value
     17PASS e.style['scroll-margin'] = "1px 2px" should set the property value
     18PASS e.style['scroll-margin'] = "1px 2px 3px" should set the property value
     19PASS e.style['scroll-margin'] = "1px 2px 3px 4px" should set the property value
     20PASS e.style['scroll-margin'] = "0 0 0 0" should set the property value
    2121

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom/cssstyledeclaration-csstext-expected.txt

    r267985 r268889  
    88PASS whitespaces in value
    99PASS invalid property does not appear
    10 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; caption-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 weight 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; page-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: start; 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: 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;"
     10FAIL 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; caption-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 weight 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; page-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: 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: 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;"
    1111

  • trunk/LayoutTests/platform/ios-wk2/imported/w3c/web-platform-tests/css/cssom/cssstyledeclaration-csstext-expected.txt

    r267985 r268889  
    88PASS whitespaces in value
    99PASS invalid property does not appear
    10 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; caption-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 weight 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; page-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: start; 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: 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;"
     10FAIL 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; caption-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 weight 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; page-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: 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: 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;"
    1111

  • trunk/Source/WebCore/ChangeLog

    r268886 r268889  
     12020-10-22  Martin Robinson  <mrobinson@igalia.com>
     2
     3        Rename scroll-snap-margin to scroll-margin
     4        https://bugs.webkit.org/show_bug.cgi?id=218075
     5
     6        Reviewed by Simon Fraser.
     7
     8        Rename scroll-snap-margin to scroll-margin while leaving scroll-snap-margin still
     9        available as an alias for backward compatibility reasons.
     10
     11        * css/CSSComputedStyleDeclaration.cpp:
     12        (WebCore::ComputedStyleExtractor::valueForPropertyInStyle): Rename CSS property name.
     13        * css/CSSProperties.json: Rename CSS property and add an alias to the old name.
     14        * css/StyleProperties.cpp: Changes to reflect new name.
     15        (WebCore::StyleProperties::getPropertyValue const): Ditto.
     16        (WebCore::StyleProperties::asText const): Ditto.
     17        * css/parser/CSSPropertyParser.cpp: Ditto.
     18        (WebCore::CSSPropertyParser::parseSingleValue): Ditto.
     19        (WebCore::CSSPropertyParser::parseShorthand): Ditto.
     20        * page/scrolling/AxisScrollSnapOffsets.cpp: Ditto.
     21        (WebCore::updateSnapOffsetsForScrollableArea): Ditto.
     22        * rendering/style/RenderStyle.cpp: Ditto.
     23        (WebCore::RenderStyle::scrollMargin const): Ditto.
     24        (WebCore::RenderStyle::scrollMarginTop const): Ditto.
     25        (WebCore::RenderStyle::scrollMarginBottom const): Ditto.
     26        (WebCore::RenderStyle::scrollMarginLeft const): Ditto.
     27        (WebCore::RenderStyle::scrollMarginRight const): Ditto.
     28        (WebCore::RenderStyle::setScrollMarginTop): Ditto.
     29        (WebCore::RenderStyle::setScrollMarginBottom): Ditto.
     30        (WebCore::RenderStyle::setScrollMarginLeft): Ditto.
     31        (WebCore::RenderStyle::setScrollMarginRight): Ditto.
     32        (WebCore::RenderStyle::scrollSnapMargin const): Deleted.
     33        (WebCore::RenderStyle::scrollSnapMarginTop const): Deleted.
     34        (WebCore::RenderStyle::scrollSnapMarginBottom const): Deleted.
     35        (WebCore::RenderStyle::scrollSnapMarginLeft const): Deleted.
     36        (WebCore::RenderStyle::scrollSnapMarginRight const): Deleted.
     37        (WebCore::RenderStyle::setScrollSnapMarginTop): Deleted.
     38        (WebCore::RenderStyle::setScrollSnapMarginBottom): Deleted.
     39        (WebCore::RenderStyle::setScrollSnapMarginLeft): Deleted.
     40        (WebCore::RenderStyle::setScrollSnapMarginRight): Deleted.
     41        * rendering/style/RenderStyle.h:
     42        (WebCore::RenderStyle::initialScrollMargin): Added to reflect new name.
     43        (WebCore::RenderStyle::initialScrollSnapMargin): Deleted.
     44        * rendering/style/StyleScrollSnapPoints.cpp: Changes to reflect new name.
     45        (WebCore::StyleScrollSnapArea::StyleScrollSnapArea): Ditto.
     46        * rendering/style/StyleScrollSnapPoints.h: Ditto.
     47        (WebCore::operator==): Ditto.
     48
    1492020-10-22  Noam Rosenthal  <noam@webkit.org>
    250

  • trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

    r268348 r268889  
    37963796            return getCSSPropertyValuesFor2SidesShorthand(paddingInlineShorthand());
    37973797#if ENABLE(CSS_SCROLL_SNAP)
    3798         case CSSPropertyScrollSnapMargin:
    3799             return getCSSPropertyValuesFor4SidesShorthand(scrollSnapMarginShorthand());
    3800         case CSSPropertyScrollSnapMarginBottom:
    3801             return zoomAdjustedPixelValueForLength(style.scrollSnapMarginBottom(), style);
    3802         case CSSPropertyScrollSnapMarginTop:
    3803             return zoomAdjustedPixelValueForLength(style.scrollSnapMarginTop(), style);
    3804         case CSSPropertyScrollSnapMarginRight:
    3805             return zoomAdjustedPixelValueForLength(style.scrollSnapMarginRight(), style);
    3806         case CSSPropertyScrollSnapMarginLeft:
    3807             return zoomAdjustedPixelValueForLength(style.scrollSnapMarginLeft(), style);
     3798        case CSSPropertyScrollMargin:
     3799            return getCSSPropertyValuesFor4SidesShorthand(scrollMarginShorthand());
     3800        case CSSPropertyScrollMarginBottom:
     3801            return zoomAdjustedPixelValueForLength(style.scrollMarginBottom(), style);
     3802        case CSSPropertyScrollMarginTop:
     3803            return zoomAdjustedPixelValueForLength(style.scrollMarginTop(), style);
     3804        case CSSPropertyScrollMarginRight:
     3805            return zoomAdjustedPixelValueForLength(style.scrollMarginRight(), style);
     3806        case CSSPropertyScrollMarginLeft:
     3807            return zoomAdjustedPixelValueForLength(style.scrollMarginLeft(), style);
    38083808        case CSSPropertyScrollPadding:
    38093809            return getCSSPropertyValuesFor4SidesShorthand(scrollPaddingShorthand());

  • trunk/Source/WebCore/css/CSSProperties.json

    r267985 r268889  
    65566556            }
    65576557        },
     6558        "scroll-margin": {
     6559            "codegen-properties": {
     6560                "enable-if": "ENABLE_CSS_SCROLL_SNAP",
     6561                "longhands": [
     6562                    "scroll-margin-top",
     6563                    "scroll-margin-right",
     6564                    "scroll-margin-bottom",
     6565                    "scroll-margin-left"
     6566                ],
     6567                "aliases": [
     6568                    "scroll-snap-margin"
     6569                ]
     6570            },
     6571            "specification": {
     6572                "category": "css-scroll-snap",
     6573                "url": "https://www.w3.org/TR/css-scroll-snap-1/#propdef-scroll-margin"
     6574            }
     6575        },
     6576        "scroll-margin-bottom": {
     6577            "codegen-properties": {
     6578                "enable-if": "ENABLE_CSS_SCROLL_SNAP",
     6579                "initial": "initialScrollMargin",
     6580                "converter": "Length",
     6581                "aliases": [
     6582                    "scroll-snap-margin-bottom"
     6583                ]
     6584            },
     6585            "specification": {
     6586                "category": "css-scroll-snap",
     6587                "url": "https://www.w3.org/TR/css-scroll-snap-1/#propdef-scroll-margin"
     6588            }
     6589        },
     6590        "scroll-margin-left": {
     6591            "codegen-properties": {
     6592                "enable-if": "ENABLE_CSS_SCROLL_SNAP",
     6593                "initial": "initialScrollMargin",
     6594                "converter": "Length",
     6595                "aliases": [
     6596                    "scroll-snap-margin-left"
     6597                ]
     6598            },
     6599            "specification": {
     6600                "category": "css-scroll-snap",
     6601                "url": "https://www.w3.org/TR/css-scroll-snap-1/#propdef-scroll-margin"
     6602            }
     6603        },
     6604        "scroll-margin-right": {
     6605            "codegen-properties": {
     6606                "enable-if": "ENABLE_CSS_SCROLL_SNAP",
     6607                "initial": "initialScrollMargin",
     6608                "converter": "Length",
     6609                "aliases": [
     6610                    "scroll-snap-margin-right"
     6611                ]
     6612            },
     6613            "specification": {
     6614                "category": "css-scroll-snap",
     6615                "url": "https://www.w3.org/TR/css-scroll-snap-1/#propdef-scroll-margin"
     6616            }
     6617        },
     6618        "scroll-margin-top": {
     6619            "codegen-properties": {
     6620                "enable-if": "ENABLE_CSS_SCROLL_SNAP",
     6621                "initial": "initialScrollMargin",
     6622                "converter": "Length",
     6623                "aliases": [
     6624                    "scroll-snap-margin-top"
     6625                ]
     6626            },
     6627            "specification": {
     6628                "category": "css-scroll-snap",
     6629                "url": "https://www.w3.org/TR/css-scroll-snap-1/#propdef-scroll-margin"
     6630            }
     6631        },
    65586632        "scroll-padding": {
    65596633            "codegen-properties": {
    … …  
    67056779                "converter": "ScrollSnapAlign",
    67066780                "enable-if": "ENABLE_CSS_SCROLL_SNAP"
    6707             },
    6708             "specification": {
    6709                 "category": "css-scroll-snap",
    6710                 "url": "https://www.w3.org/TR/css-scroll-snap-1/#propdef-scroll-padding"
    6711             }
    6712         },
    6713         "scroll-snap-margin": {
    6714             "codegen-properties": {
    6715                 "enable-if": "ENABLE_CSS_SCROLL_SNAP",
    6716                 "longhands": [
    6717                     "scroll-snap-margin-top",
    6718                     "scroll-snap-margin-right",
    6719                     "scroll-snap-margin-bottom",
    6720                     "scroll-snap-margin-left"
    6721                 ]
    6722             },
    6723             "specification": {
    6724                 "category": "css-scroll-snap",
    6725                 "url": "https://www.w3.org/TR/css-scroll-snap-1/#propdef-scroll-padding"
    6726             }
    6727         },
    6728         "scroll-snap-margin-bottom": {
    6729             "codegen-properties": {
    6730                 "enable-if": "ENABLE_CSS_SCROLL_SNAP",
    6731                 "initial": "initialScrollSnapMargin",
    6732                 "converter": "Length"
    6733             },
    6734             "specification": {
    6735                 "category": "css-scroll-snap",
    6736                 "url": "https://www.w3.org/TR/css-scroll-snap-1/#propdef-scroll-padding"
    6737             }
    6738         },
    6739         "scroll-snap-margin-left": {
    6740             "codegen-properties": {
    6741                 "enable-if": "ENABLE_CSS_SCROLL_SNAP",
    6742                 "initial": "initialScrollSnapMargin",
    6743                 "converter": "Length"
    6744             },
    6745             "specification": {
    6746                 "category": "css-scroll-snap",
    6747                 "url": "https://www.w3.org/TR/css-scroll-snap-1/#propdef-scroll-padding"
    6748             }
    6749         },
    6750         "scroll-snap-margin-right": {
    6751             "codegen-properties": {
    6752                 "enable-if": "ENABLE_CSS_SCROLL_SNAP",
    6753                 "initial": "initialScrollSnapMargin",
    6754                 "converter": "Length"
    6755             },
    6756             "specification": {
    6757                 "category": "css-scroll-snap",
    6758                 "url": "https://www.w3.org/TR/css-scroll-snap-1/#propdef-scroll-padding"
    6759             }
    6760         },
    6761         "scroll-snap-margin-top": {
    6762             "codegen-properties": {
    6763                 "enable-if": "ENABLE_CSS_SCROLL_SNAP",
    6764                 "initial": "initialScrollSnapMargin",
    6765                 "converter": "Length"
    67666781            },
    67676782            "specification": {

  • trunk/Source/WebCore/css/StyleProperties.cpp

    r266660 r268889  
    287287        return get2Values(gapShorthand());
    288288#if ENABLE(CSS_SCROLL_SNAP)
    289     case CSSPropertyScrollSnapMargin:
    290         return get4Values(scrollSnapMarginShorthand());
     289    case CSSPropertyScrollMargin:
     290        return get4Values(scrollMarginShorthand());
    291291    case CSSPropertyScrollPadding:
    292292        return get4Values(scrollPaddingShorthand());
    … …  
    11761176                shorthandPropertyID = CSSPropertyScrollPadding;
    11771177                break;
    1178             case CSSPropertyScrollSnapMarginTop:
    1179             case CSSPropertyScrollSnapMarginRight:
    1180             case CSSPropertyScrollSnapMarginBottom:
    1181             case CSSPropertyScrollSnapMarginLeft:
    1182                 shorthandPropertyID = CSSPropertyScrollSnapMargin;
     1178            case CSSPropertyScrollMarginTop:
     1179            case CSSPropertyScrollMarginRight:
     1180            case CSSPropertyScrollMarginBottom:
     1181            case CSSPropertyScrollMarginLeft:
     1182                shorthandPropertyID = CSSPropertyScrollMargin;
    11831183                break;
    11841184#endif

  • trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp

    r268665 r268889  
    41434143        return consumeLengthOrPercent(m_range, m_context.mode, ValueRangeNonNegative, UnitlessQuirk::Forbid);
    41444144#if ENABLE(CSS_SCROLL_SNAP)
    4145     case CSSPropertyScrollSnapMarginBottom:
    4146     case CSSPropertyScrollSnapMarginLeft:
    4147     case CSSPropertyScrollSnapMarginRight:
    4148     case CSSPropertyScrollSnapMarginTop:
     4145    case CSSPropertyScrollMarginBottom:
     4146    case CSSPropertyScrollMarginLeft:
     4147    case CSSPropertyScrollMarginRight:
     4148    case CSSPropertyScrollMarginTop:
    41494149        return consumeLength(m_range, m_context.mode, ValueRangeAll);
    41504150    case CSSPropertyScrollPaddingBottom:
    … …  
    58265826        return consume2ValueShorthand(paddingInlineShorthand(), important);
    58275827#if ENABLE(CSS_SCROLL_SNAP)
    5828     case CSSPropertyScrollSnapMargin:
    5829         return consume4ValueShorthand(scrollSnapMarginShorthand(), important);
     5828    case CSSPropertyScrollMargin:
     5829        return consume4ValueShorthand(scrollMarginShorthand(), important);
    58305830    case CSSPropertyScrollPadding:
    58315831        return consume4ValueShorthand(scrollPaddingShorthand(), important);

  • trunk/Source/WebCore/page/scrolling/AxisScrollSnapOffsets.cpp

    r268856 r268889  
    201201            scrollSnapArea.moveBy(scrollPosition);
    202202
    203         scrollSnapArea = computeScrollSnapPortOrAreaRect(scrollSnapArea, child->style().scrollSnapMargin(), InsetOrOutset::Outset);
     203        scrollSnapArea = computeScrollSnapPortOrAreaRect(scrollSnapArea, child->style().scrollMargin(), InsetOrOutset::Outset);
    204204        LOG_WITH_STREAM(ScrollSnap, stream << "    Considering scroll snap target area " << scrollSnapArea);
    205205        auto alignment = child->style().scrollSnapAlign();

  • trunk/Source/WebCore/rendering/style/RenderStyle.cpp

    r268444 r268889  
    24502450}
    24512451
    2452 const LengthBox& RenderStyle::scrollSnapMargin() const
    2453 {
    2454     return m_rareNonInheritedData->scrollSnapArea->scrollSnapMargin;
    2455 }
    2456 
    2457 const Length& RenderStyle::scrollSnapMarginTop() const
    2458 {
    2459     return scrollSnapMargin().top();
    2460 }
    2461 
    2462 const Length& RenderStyle::scrollSnapMarginBottom() const
    2463 {
    2464     return scrollSnapMargin().bottom();
    2465 }
    2466 
    2467 const Length& RenderStyle::scrollSnapMarginLeft() const
    2468 {
    2469     return scrollSnapMargin().left();
    2470 }
    2471 
    2472 const Length& RenderStyle::scrollSnapMarginRight() const
    2473 {
    2474     return scrollSnapMargin().right();
     2452const LengthBox& RenderStyle::scrollMargin() const
     2453{
     2454    return m_rareNonInheritedData->scrollSnapArea->scrollMargin;
     2455}
     2456
     2457const Length& RenderStyle::scrollMarginTop() const
     2458{
     2459    return scrollMargin().top();
     2460}
     2461
     2462const Length& RenderStyle::scrollMarginBottom() const
     2463{
     2464    return scrollMargin().bottom();
     2465}
     2466
     2467const Length& RenderStyle::scrollMarginLeft() const
     2468{
     2469    return scrollMargin().left();
     2470}
     2471
     2472const Length& RenderStyle::scrollMarginRight() const
     2473{
     2474    return scrollMargin().right();
    24752475}
    24762476
    … …  
    25052505}
    25062506
    2507 void RenderStyle::setScrollSnapMarginTop(Length&& length)
    2508 {
    2509     SET_NESTED_VAR(m_rareNonInheritedData, scrollSnapArea, scrollSnapMargin.top(), WTFMove(length));
    2510 }
    2511 
    2512 void RenderStyle::setScrollSnapMarginBottom(Length&& length)
    2513 {
    2514     SET_NESTED_VAR(m_rareNonInheritedData, scrollSnapArea, scrollSnapMargin.bottom(), WTFMove(length));
    2515 }
    2516 
    2517 void RenderStyle::setScrollSnapMarginLeft(Length&& length)
    2518 {
    2519     SET_NESTED_VAR(m_rareNonInheritedData, scrollSnapArea, scrollSnapMargin.left(), WTFMove(length));
    2520 }
    2521 
    2522 void RenderStyle::setScrollSnapMarginRight(Length&& length)
    2523 {
    2524     SET_NESTED_VAR(m_rareNonInheritedData, scrollSnapArea, scrollSnapMargin.right(), WTFMove(length));
     2507void RenderStyle::setScrollMarginTop(Length&& length)
     2508{
     2509    SET_NESTED_VAR(m_rareNonInheritedData, scrollSnapArea, scrollMargin.top(), WTFMove(length));
     2510}
     2511
     2512void RenderStyle::setScrollMarginBottom(Length&& length)
     2513{
     2514    SET_NESTED_VAR(m_rareNonInheritedData, scrollSnapArea, scrollMargin.bottom(), WTFMove(length));
     2515}
     2516
     2517void RenderStyle::setScrollMarginLeft(Length&& length)
     2518{
     2519    SET_NESTED_VAR(m_rareNonInheritedData, scrollSnapArea, scrollMargin.left(), WTFMove(length));
     2520}
     2521
     2522void RenderStyle::setScrollMarginRight(Length&& length)
     2523{
     2524    SET_NESTED_VAR(m_rareNonInheritedData, scrollSnapArea, scrollMargin.right(), WTFMove(length));
    25252525}
    25262526

  • trunk/Source/WebCore/rendering/style/RenderStyle.h

    r268718 r268889  
    733733    const StyleScrollSnapArea& scrollSnapArea() const;
    734734    const ScrollSnapAlign& scrollSnapAlign() const;
    735     const LengthBox& scrollSnapMargin() const;
    736     const Length& scrollSnapMarginTop() const;
    737     const Length& scrollSnapMarginBottom() const;
    738     const Length& scrollSnapMarginLeft() const;
    739     const Length& scrollSnapMarginRight() const;
     735    const LengthBox& scrollMargin() const;
     736    const Length& scrollMarginTop() const;
     737    const Length& scrollMarginBottom() const;
     738    const Length& scrollMarginLeft() const;
     739    const Length& scrollMarginRight() const;
    740740#endif
    741741
    … …  
    12741274
    12751275    void setScrollSnapAlign(const ScrollSnapAlign&);
    1276     void setScrollSnapMarginTop(Length&&);
    1277     void setScrollSnapMarginBottom(Length&&);
    1278     void setScrollSnapMarginLeft(Length&&);
    1279     void setScrollSnapMarginRight(Length&&);
     1276    void setScrollMarginTop(Length&&);
     1277    void setScrollMarginBottom(Length&&);
     1278    void setScrollMarginLeft(Length&&);
     1279    void setScrollMarginRight(Length&&);
    12801280#endif
    12811281
    … …  
    16781678    static ScrollSnapType initialScrollSnapType();
    16791679    static ScrollSnapAlign initialScrollSnapAlign();
    1680     static Length initialScrollSnapMargin() { return Length(Fixed); }
     1680    static Length initialScrollMargin() { return Length(Fixed); }
    16811681    static Length initialScrollPadding() { return Length(Fixed); }
    16821682#endif

  • trunk/Source/WebCore/rendering/style/StyleScrollSnapPoints.cpp

    r210024 r268889  
    5353
    5454StyleScrollSnapArea::StyleScrollSnapArea()
    55     : scrollSnapMargin(0, 0, 0, 0)
     55    : scrollMargin(0, 0, 0, 0)
    5656{
    5757}
    … …  
    6060    : RefCounted()
    6161    , alignment(other.alignment)
    62     , scrollSnapMargin(other.scrollSnapMargin)
     62    , scrollMargin(other.scrollMargin)
    6363{
    6464}

  • trunk/Source/WebCore/rendering/style/StyleScrollSnapPoints.h

    r210024 r268889  
    8787
    8888    ScrollSnapAlign alignment;
    89     LengthBox scrollSnapMargin { 0, 0, 0, 0 };
     89    LengthBox scrollMargin { 0, 0, 0, 0 };
    9090
    9191private:
    … …  
    9696inline bool operator==(const StyleScrollSnapArea& a, const StyleScrollSnapArea& b)
    9797{
    98     return a.alignment == b.alignment && a.scrollSnapMargin == b.scrollSnapMargin;
     98    return a.alignment == b.alignment && a.scrollMargin == b.scrollMargin;
    9999}
    100100
Note: See TracChangeset for help on using the changeset viewer.