Changeset 287487 in webkit


Ignore:
Timestamp:
Dec 30, 2021 4:26:34 PM (7 months ago)
Author:
ntim@apple.com
Message:

Implement text-combine-upright property
​https://bugs.webkit.org/show_bug.cgi?id=150821

Reviewed by Dean Jackson.

LayoutTests/imported/w3c:

  • web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
  • web-platform-tests/css/css-pseudo/parsing/marker-supported-properties-expected.txt:
  • web-platform-tests/css/css-pseudo/parsing/marker-supported-properties-in-animation-expected.txt:
  • web-platform-tests/css/css-writing-modes/inheritance-expected.txt:
  • web-platform-tests/css/css-writing-modes/parsing/text-combine-upright-computed-expected.txt:
  • web-platform-tests/css/css-writing-modes/parsing/text-combine-upright-valid-expected.txt:
  • web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-digits-001-expected.txt:
  • web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-digits-002-expected.txt:
  • web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-invalid-001-expected.txt:
  • web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-invalid-002-expected.txt:
  • web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-valid-001-expected.txt:
  • web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:

Source/WebCore:

webkit.org/b/234694 and webkit.org/b/234707 are landed for this initial version of text-combine-upright.

To reach Chrome parity, layout needs to be tweaked (webkit.org/b/234704), and pseudo elements need to be properly supported (webkit.org/b/234705).

To reach standards parity, it also needs the digits syntax to be implemented (webkit.org/b/234706), which no browser implements yet.

  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::ComputedStyleExtractor::valueForPropertyInStyle):

  • css/CSSPrimitiveValueMappings.h:

(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
(WebCore::CSSPrimitiveValue::operator TextCombine const):

  • css/CSSProperties.json:
  • css/CSSValueKeywords.in:
  • css/parser/CSSParserFastPaths.cpp:

(WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
(WebCore::CSSParserFastPaths::isKeywordPropertyID):

  • rendering/LegacyLineLayout.cpp:

(WebCore::expansionBehaviorForInlineTextBox):

  • rendering/style/RenderStyleConstants.cpp:

(WebCore::operator<<):

  • rendering/style/RenderStyleConstants.h:
  • style/PropertyAllowlist.cpp:

(WebCore::Style::isValidMarkerStyleProperty):
Allow setting text-combine-upright on ::marker.

LayoutTests:

  • TestExpectations:
  • fast/css/getComputedStyle/computed-style-expected.txt:
  • fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • fast/css/getComputedStyle/resources/property-names.js:
  • platform/glib/fast/css/getComputedStyle/computed-style-expected.txt:
  • platform/glib/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • platform/glib/svg/css/getComputedStyle-basic-expected.txt:
  • platform/gtk/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:
  • platform/ios/fast/css/getComputedStyle/computed-style-expected.txt:
  • platform/ios/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
  • platform/ios/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:
  • platform/ios/svg/css/getComputedStyle-basic-expected.txt:
  • platform/wpe/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:
  • svg/css/getComputedStyle-basic-expected.txt:
Location:
trunk
Files:
39 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r287485 r287487  
     12021-12-27  Tim Nguyen  <ntim@apple.com>
     2
     3        Implement text-combine-upright property
     4        https://bugs.webkit.org/show_bug.cgi?id=150821
     5
     6        Reviewed by Dean Jackson.
     7
     8        * TestExpectations:
     9        * fast/css/getComputedStyle/computed-style-expected.txt:
     10        * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     11        * fast/css/getComputedStyle/resources/property-names.js:
     12        * platform/glib/fast/css/getComputedStyle/computed-style-expected.txt:
     13        * platform/glib/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     14        * platform/glib/svg/css/getComputedStyle-basic-expected.txt:
     15        * platform/gtk/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:
     16        * platform/ios/fast/css/getComputedStyle/computed-style-expected.txt:
     17        * platform/ios/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     18        * platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
     19        * platform/ios/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:
     20        * platform/ios/svg/css/getComputedStyle-basic-expected.txt:
     21        * platform/wpe/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:
     22        * svg/css/getComputedStyle-basic-expected.txt:
     23
    1242021-12-30  Alan Bujtas  <zalan@apple.com>
    225

  • trunk/LayoutTests/TestExpectations

    r287473 r287487  
    25932593http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-iframe-report-only.html [ Pass Failure ]
    25942594
     2595# text-transform: full-width support
     2596webkit.org/b/143153 imported/w3c/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-001.xht [ ImageOnlyFailure ]
     2597webkit.org/b/143153 imported/w3c/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-002.xht [ ImageOnlyFailure ]
     2598webkit.org/b/143153 imported/w3c/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-004.xht [ ImageOnlyFailure ]
     2599webkit.org/b/143153 imported/w3c/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-005.xht [ ImageOnlyFailure ]
     2600webkit.org/b/143153 imported/w3c/web-platform-tests/css/css-writing-modes/full-width-001.html [ ImageOnlyFailure ]
     2601webkit.org/b/143153 imported/w3c/web-platform-tests/css/css-writing-modes/full-width-002.html [ ImageOnlyFailure ]
     2602webkit.org/b/143153 imported/w3c/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-008.html [ ImageOnlyFailure ]
     2603webkit.org/b/143153 imported/w3c/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-009.html [ ImageOnlyFailure ]
     2604webkit.org/b/143153 imported/w3c/web-platform-tests/css/css-text/text-transform/text-transform-multiple-001.html [ ImageOnlyFailure ]
     2605webkit.org/b/143153 imported/w3c/web-platform-tests/css/css-text/word-boundary/word-boundary-009.html [ ImageOnlyFailure ]
     2606
    25952607# css-text start
    25962608webkit.org/b/195275 imported/w3c/web-platform-tests/css/css-text/boundary-shaping/boundary-shaping-001.html [ ImageOnlyFailure ]
    … …  
    26762688webkit.org/b/183258 imported/w3c/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-026.html [ ImageOnlyFailure Pass ]
    26772689webkit.org/b/183258 imported/w3c/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-028.html [ ImageOnlyFailure Pass ]
    2678 webkit.org/b/183258 imported/w3c/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-001.xht [ ImageOnlyFailure ]
    2679 webkit.org/b/183258 imported/w3c/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-002.xht [ ImageOnlyFailure ]
    2680 webkit.org/b/183258 imported/w3c/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-004.xht [ ImageOnlyFailure ]
    2681 webkit.org/b/183258 imported/w3c/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-005.xht [ ImageOnlyFailure ]
    26822690webkit.org/b/183258 imported/w3c/web-platform-tests/css/css-text/text-transform/text-transform-tailoring-001.html [ ImageOnlyFailure ]
    26832691webkit.org/b/183258 imported/w3c/web-platform-tests/css/css-text/text-transform/text-transform-tailoring-002.html [ ImageOnlyFailure ]
    … …  
    27012709webkit.org/b/195275 imported/w3c/web-platform-tests/css/css-text/text-transform/text-transform-shaping-002.html [ ImageOnlyFailure ]
    27022710webkit.org/b/195275 imported/w3c/web-platform-tests/css/css-text/text-transform/text-transform-shaping-001.html [ ImageOnlyFailure ]
    2703 webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-008.html [ ImageOnlyFailure ]
    2704 webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-009.html [ ImageOnlyFailure ]
    2705 webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/text-transform/text-transform-multiple-001.html [ ImageOnlyFailure ]
    27062711webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-016.html [ ImageOnlyFailure ]
    27072712webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-044.html [ ImageOnlyFailure ]
    … …  
    27532758webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/word-boundary/word-boundary-007.html [ ImageOnlyFailure ]
    27542759webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/word-boundary/word-boundary-008.html [ ImageOnlyFailure ]
    2755 webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/word-boundary/word-boundary-009.html [ ImageOnlyFailure ]
    27562760webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/word-boundary/word-boundary-010.html [ ImageOnlyFailure ]
    27572761webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/word-boundary/word-boundary-011.html [ ImageOnlyFailure ]
    … …  
    40384042webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/background-size-document-root-vrl-006.html [ ImageOnlyFailure ]
    40394043webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/background-size-document-root-vrl-008.html [ ImageOnlyFailure ]
    4040 webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/bidi-plaintext-011.html [ ImageOnlyFailure ]
    40414044webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-043.xht [ ImageOnlyFailure ]
    40424045webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-047.xht [ ImageOnlyFailure ]
    … …  
    40734076webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/clearance-calculations-vrl-006.xht [ ImageOnlyFailure ]
    40744077webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/float-in-htb-in-vrl.html [ ImageOnlyFailure ]
    4075 webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/full-width-001.html [ ImageOnlyFailure ]
    40764078webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/inline-block-alignment-003.xht [ ImageOnlyFailure ]
    40774079webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/inline-block-alignment-005.xht [ ImageOnlyFailure ]
    … …  
    41624164webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/text-baseline-slr-009.xht [ ImageOnlyFailure ]
    41634165webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/text-baseline-srl-008.xht [ ImageOnlyFailure ]
    4164 webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/text-combine-upright-layout-rules-001.html [ ImageOnlyFailure ]
    4165 webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/text-combine-upright-line-breaking-rules-001.html [ ImageOnlyFailure ]
    4166 webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/text-combine-upright-value-all-001.html [ ImageOnlyFailure ]
    4167 webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/text-combine-upright-value-all-002.html [ ImageOnlyFailure ]
    4168 webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/text-combine-upright-value-all-003.html [ ImageOnlyFailure ]
    4169 webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits2-001.html [ ImageOnlyFailure ]
    4170 webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits2-002.html [ ImageOnlyFailure ]
    4171 webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits3-001.html [ ImageOnlyFailure ]
    4172 webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits3-002.html [ ImageOnlyFailure ]
    4173 webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits4-001.html [ ImageOnlyFailure ]
    4174 webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits4-002.html [ ImageOnlyFailure ]
    41754166webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/text-orientation-mixed-srl-016.xht [ ImageOnlyFailure ]
    41764167webkit.org/b/209080 imported/w3c/web-platform-tests/css/css-writing-modes/text-orientation-mixed-vlr-100.html [ ImageOnlyFailure ]
    … …  
    42154206webkit.org/b/212046 imported/w3c/web-platform-tests/css/css-flexbox/scrollbars-auto.html [ ImageOnlyFailure ]
    42164207webkit.org/b/212046 imported/w3c/web-platform-tests/css/css-flexbox/scrollbars.html [ ImageOnlyFailure ]
     4208
     4209# text-combine-upright bugs
     4210webkit.org/b/234707 imported/w3c/web-platform-tests/css/css-writing-modes/text-combine-upright-decorations-001.html [ ImageOnlyFailure ]
     4211webkit.org/b/234704 imported/w3c/web-platform-tests/css/css-writing-modes/text-combine-upright-layout-rules-001.html [ ImageOnlyFailure ]
     4212webkit.org/b/164510 imported/w3c/web-platform-tests/css/css-writing-modes/text-combine-upright-line-breaking-rules-001.html [ ImageOnlyFailure ]
     4213webkit.org/b/234704 imported/w3c/web-platform-tests/css/css-writing-modes/text-combine-upright-value-all-001.html [ ImageOnlyFailure ]
     4214webkit.org/b/234704 imported/w3c/web-platform-tests/css/css-writing-modes/text-combine-upright-value-all-002.html [ ImageOnlyFailure ]
     4215webkit.org/b/234704 imported/w3c/web-platform-tests/css/css-writing-modes/text-combine-upright-value-all-003.html [ ImageOnlyFailure ]
     4216webkit.org/b/234706 imported/w3c/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits2-001.html [ ImageOnlyFailure ]
     4217webkit.org/b/234706 imported/w3c/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits2-002.html [ ImageOnlyFailure ]
     4218webkit.org/b/234706 imported/w3c/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits3-001.html [ ImageOnlyFailure ]
     4219webkit.org/b/234706 imported/w3c/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits3-002.html [ ImageOnlyFailure ]
     4220webkit.org/b/234706 imported/w3c/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits4-001.html [ ImageOnlyFailure ]
     4221webkit.org/b/234706 imported/w3c/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits4-002.html [ ImageOnlyFailure ]
     4222webkit.org/b/234705 imported/w3c/web-platform-tests/css/css-pseudo/marker-text-combine-upright.html [ ImageOnlyFailure ]
    42174223
    42184224# Used flex-basis should be used to compute definiteness instead of specified.
    … …  
    43254331webkit.org/b/214291 imported/w3c/web-platform-tests/css/css-writing-modes/available-size-004.html [ ImageOnlyFailure ]
    43264332webkit.org/b/214291 imported/w3c/web-platform-tests/css/css-writing-modes/available-size-018.html [ ImageOnlyFailure ]
    4327 webkit.org/b/214291 imported/w3c/web-platform-tests/css/css-writing-modes/baseline-with-orthogonal-flow-001.html [ ImageOnlyFailure ]
    43284333webkit.org/b/214291 imported/w3c/web-platform-tests/css/css-writing-modes/direction-upright-001.html [ ImageOnlyFailure ]
    43294334webkit.org/b/214291 imported/w3c/web-platform-tests/css/css-writing-modes/direction-upright-002.html [ ImageOnlyFailure ]
    … …  
    45384543webkit.org/b/214461 imported/w3c/web-platform-tests/css/css-pseudo/marker-font-variant-numeric-normal.html [ ImageOnlyFailure ]
    45394544webkit.org/b/214461 imported/w3c/web-platform-tests/css/css-pseudo/marker-list-style-position.html [ ImageOnlyFailure ]
    4540 webkit.org/b/214461 imported/w3c/web-platform-tests/css/css-pseudo/marker-text-combine-upright.html [ ImageOnlyFailure ]
    45414545webkit.org/b/214461 imported/w3c/web-platform-tests/css/css-pseudo/marker-unicode-bidi-default.html [ ImageOnlyFailure ]
    45424546webkit.org/b/214461 imported/w3c/web-platform-tests/css/css-pseudo/marker-unicode-bidi-normal.html [ ImageOnlyFailure ]

  • trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt

    r287460 r287487  
    172172text-align: start;
    173173text-anchor: start;
     174text-combine-upright: none;
    174175text-decoration: none;
    175176text-emphasis-color: rgb(0, 0, 0);
    … …  
    246247-webkit-print-color-adjust: economy;
    247248-webkit-rtl-ordering: logical;
    248 -webkit-text-combine: none;
    249249-webkit-text-fill-color: rgb(0, 0, 0);
    250250-webkit-text-orientation: mixed;

  • trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

    r287460 r287487  
    171171text-align: start
    172172text-anchor: start
     173text-combine-upright: none
    173174text-decoration: none
    174175text-emphasis-color: rgb(0, 0, 0)
    … …  
    245246-webkit-print-color-adjust: economy
    246247-webkit-rtl-ordering: logical
    247 -webkit-text-combine: none
    248248-webkit-text-fill-color: rgb(0, 0, 0)
    249249-webkit-text-orientation: mixed

  • trunk/LayoutTests/fast/css/getComputedStyle/resources/property-names.js

    r287434 r287487  
    9898    "-webkit-print-color-adjust": true,
    9999    "-webkit-rtl-ordering": true,
    100     "-webkit-text-combine": true,
     100    "text-combine-upright": true,
    101101    "-webkit-text-decorations-in-effect": true,
    102102    "text-emphasis-color": true,

  • trunk/LayoutTests/imported/w3c/ChangeLog

    r287474 r287487  
     12021-12-27  Tim Nguyen  <ntim@apple.com>
     2
     3        Implement text-combine-upright property
     4        https://bugs.webkit.org/show_bug.cgi?id=150821
     5
     6        Reviewed by Dean Jackson.
     7
     8        * web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
     9        * web-platform-tests/css/css-pseudo/parsing/marker-supported-properties-expected.txt:
     10        * web-platform-tests/css/css-pseudo/parsing/marker-supported-properties-in-animation-expected.txt:
     11        * web-platform-tests/css/css-writing-modes/inheritance-expected.txt:
     12        * web-platform-tests/css/css-writing-modes/parsing/text-combine-upright-computed-expected.txt:
     13        * web-platform-tests/css/css-writing-modes/parsing/text-combine-upright-valid-expected.txt:
     14        * web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-digits-001-expected.txt:
     15        * web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-digits-002-expected.txt:
     16        * web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-invalid-001-expected.txt:
     17        * web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-invalid-002-expected.txt:
     18        * web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-valid-001-expected.txt:
     19        * web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:
     20
    1212021-12-28  Sam Weinig  <weinig@apple.com>
    222

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

    r287434 r287487  
    282282PASS text-align
    283283PASS text-anchor
     284PASS text-combine-upright
    284285PASS text-decoration
    285286PASS text-decoration-color

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-pseudo/parsing/marker-supported-properties-expected.txt

    r284519 r287487  
    1919PASS Property white-space value 'nowrap' in ::marker
    2020PASS Property color value 'rgb(0, 100, 200)' in ::marker
    21 FAIL Property text-combine-upright value 'all' in ::marker assert_true: text-combine-upright doesn't seem to be supported in the computed style expected true got false
     21PASS Property text-combine-upright value 'all' in ::marker
    2222PASS Property unicode-bidi value 'plaintext' in ::marker
    2323PASS Property direction value 'rtl' in ::marker

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-pseudo/parsing/marker-supported-properties-in-animation-expected.txt

    r285621 r287487  
    1919FAIL Animation of white-space in ::marker assert_equals: expected "nowrap" but got "pre"
    2020FAIL Animation of color in ::marker assert_equals: expected "rgb(50, 150, 100)" but got "rgb(0, 0, 0)"
    21 FAIL Animation of text-combine-upright in ::marker assert_true: text-combine-upright doesn't seem to be supported in the computed style expected true got false
     21PASS Animation of text-combine-upright in ::marker
    2222PASS Animation of unicode-bidi in ::marker
    2323PASS Animation of direction in ::marker
    … …  
    6363PASS Transition of white-space in ::marker
    6464PASS Transition of color in ::marker
    65 FAIL Transition of text-combine-upright in ::marker assert_true: text-combine-upright doesn't seem to be supported in the computed style expected true got false
     65PASS Transition of text-combine-upright in ::marker
    6666PASS Transition of unicode-bidi in ::marker
    6767PASS Transition of direction in ::marker

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-writing-modes/inheritance-expected.txt

    r267650 r287487  
    22PASS Property direction has initial value ltr
    33PASS Property direction inherits
    4 FAIL Property text-combine-upright has initial value none assert_true: text-combine-upright doesn't seem to be supported in the computed style expected true got false
    5 FAIL Property text-combine-upright inherits assert_true: text-combine-upright doesn't seem to be supported in the computed style expected true got false
     4PASS Property text-combine-upright has initial value none
     5PASS Property text-combine-upright inherits
    66PASS Property text-orientation has initial value mixed
    77PASS Property text-orientation inherits

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-writing-modes/parsing/text-combine-upright-computed-expected.txt

    r264456 r287487  
    11
    2 FAIL Property text-combine-upright value 'none' assert_true: text-combine-upright doesn't seem to be supported in the computed style expected true got false
    3 FAIL Property text-combine-upright value 'all' assert_true: text-combine-upright doesn't seem to be supported in the computed style expected true got false
     2PASS Property text-combine-upright value 'none'
     3PASS Property text-combine-upright value 'all'
    44

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-writing-modes/parsing/text-combine-upright-valid-expected.txt

    r258661 r287487  
    11
    2 FAIL e.style['text-combine-upright'] = "none" should set the property value assert_not_equals: property should be set got disallowed value ""
    3 FAIL e.style['text-combine-upright'] = "all" should set the property value assert_not_equals: property should be set got disallowed value ""
     2PASS e.style['text-combine-upright'] = "none" should set the property value
     3PASS e.style['text-combine-upright'] = "all" should set the property value
    44

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-digits-001-expected.txt

    r258661 r287487  
    11
    2 FAIL Computed value for `text-combine-upright: digits` is `digits 2` assert_equals: expected (string) "digits 2" but got (undefined) undefined
    3 FAIL Computed value for `text-combine-upright: digits 2` is `digits 2` assert_equals: expected (string) "digits 2" but got (undefined) undefined
    4 FAIL Computed value for `text-combine-upright: digits 3` is `digits 3` assert_equals: expected (string) "digits 3" but got (undefined) undefined
    5 FAIL Computed value for `text-combine-upright: digits 4` is `digits 4` assert_equals: expected (string) "digits 4" but got (undefined) undefined
    6 FAIL Computed value for `text-combine-upright: digits +2` is `digits 2` assert_equals: expected (string) "digits 2" but got (undefined) undefined
    7 FAIL Computed value for `text-combine-upright: digits+3` is `digits 3` assert_equals: expected (string) "digits 3" but got (undefined) undefined
    8 FAIL Computed value for `text-combine-upright: digits[TAB]4` is `digits 4` assert_equals: expected (string) "digits 4" but got (undefined) undefined
    9 FAIL Computed value for `text-combine-upright: digits[LF]2` is `digits 2` assert_equals: expected (string) "digits 2" but got (undefined) undefined
    10 FAIL Computed value for `text-combine-upright: digits [TAB]3` is `digits 3` assert_equals: expected (string) "digits 3" but got (undefined) undefined
    11 FAIL Computed value for `text-combine-upright: digits[TAB][LF]4` is `digits 4` assert_equals: expected (string) "digits 4" but got (undefined) undefined
     2FAIL Computed value for `text-combine-upright: digits` is `digits 2` assert_equals: expected "digits 2" but got "none"
     3FAIL Computed value for `text-combine-upright: digits 2` is `digits 2` assert_equals: expected "digits 2" but got "none"
     4FAIL Computed value for `text-combine-upright: digits 3` is `digits 3` assert_equals: expected "digits 3" but got "none"
     5FAIL Computed value for `text-combine-upright: digits 4` is `digits 4` assert_equals: expected "digits 4" but got "none"
     6FAIL Computed value for `text-combine-upright: digits +2` is `digits 2` assert_equals: expected "digits 2" but got "none"
     7FAIL Computed value for `text-combine-upright: digits+3` is `digits 3` assert_equals: expected "digits 3" but got "none"
     8FAIL Computed value for `text-combine-upright: digits[TAB]4` is `digits 4` assert_equals: expected "digits 4" but got "none"
     9FAIL Computed value for `text-combine-upright: digits[LF]2` is `digits 2` assert_equals: expected "digits 2" but got "none"
     10FAIL Computed value for `text-combine-upright: digits [TAB]3` is `digits 3` assert_equals: expected "digits 3" but got "none"
     11FAIL Computed value for `text-combine-upright: digits[TAB][LF]4` is `digits 4` assert_equals: expected "digits 4" but got "none"
    1212

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-digits-002-expected.txt

    r258661 r287487  
    11
    2 FAIL Computed value for `text-combine-upright: digits calc(1 + 1)` is `digits 2` assert_equals: expected (string) "digits 2" but got (undefined) undefined
    3 FAIL Computed value for `text-combine-upright: digits calc(1 + 1 + 1)` is `digits 3` assert_equals: expected (string) "digits 3" but got (undefined) undefined
    4 FAIL Computed value for `text-combine-upright: digits calc(2 + 2)` is `digits 4` assert_equals: expected (string) "digits 4" but got (undefined) undefined
    5 FAIL Computed value for `text-combine-upright: digits calc(4 - 2)` is `digits 2` assert_equals: expected (string) "digits 2" but got (undefined) undefined
    6 FAIL Computed value for `text-combine-upright: digits calc(6 - 3)` is `digits 3` assert_equals: expected (string) "digits 3" but got (undefined) undefined
    7 FAIL Computed value for `text-combine-upright: digits calc(7 - 1 - 2)` is `digits 4` assert_equals: expected (string) "digits 4" but got (undefined) undefined
    8 FAIL Computed value for `text-combine-upright: digits calc(2 * 1)` is `digits 2` assert_equals: expected (string) "digits 2" but got (undefined) undefined
    9 FAIL Computed value for `text-combine-upright: digits calc(3 * 1)` is `digits 3` assert_equals: expected (string) "digits 3" but got (undefined) undefined
    10 FAIL Computed value for `text-combine-upright: digits calc(2 * 2 * 1)` is `digits 4` assert_equals: expected (string) "digits 4" but got (undefined) undefined
    11 FAIL Computed value for `text-combine-upright: digits calc(4 / 2)` is `digits 2` assert_equals: expected (string) "digits 2" but got (undefined) undefined
    12 FAIL Computed value for `text-combine-upright: digits calc(6 / 2)` is `digits 3` assert_equals: expected (string) "digits 3" but got (undefined) undefined
    13 FAIL Computed value for `text-combine-upright: digits calc(24 / 3 / 2)` is `digits 4` assert_equals: expected (string) "digits 4" but got (undefined) undefined
     2FAIL Computed value for `text-combine-upright: digits calc(1 + 1)` is `digits 2` assert_equals: expected "digits 2" but got "none"
     3FAIL Computed value for `text-combine-upright: digits calc(1 + 1 + 1)` is `digits 3` assert_equals: expected "digits 3" but got "none"
     4FAIL Computed value for `text-combine-upright: digits calc(2 + 2)` is `digits 4` assert_equals: expected "digits 4" but got "none"
     5FAIL Computed value for `text-combine-upright: digits calc(4 - 2)` is `digits 2` assert_equals: expected "digits 2" but got "none"
     6FAIL Computed value for `text-combine-upright: digits calc(6 - 3)` is `digits 3` assert_equals: expected "digits 3" but got "none"
     7FAIL Computed value for `text-combine-upright: digits calc(7 - 1 - 2)` is `digits 4` assert_equals: expected "digits 4" but got "none"
     8FAIL Computed value for `text-combine-upright: digits calc(2 * 1)` is `digits 2` assert_equals: expected "digits 2" but got "none"
     9FAIL Computed value for `text-combine-upright: digits calc(3 * 1)` is `digits 3` assert_equals: expected "digits 3" but got "none"
     10FAIL Computed value for `text-combine-upright: digits calc(2 * 2 * 1)` is `digits 4` assert_equals: expected "digits 4" but got "none"
     11FAIL Computed value for `text-combine-upright: digits calc(4 / 2)` is `digits 2` assert_equals: expected "digits 2" but got "none"
     12FAIL Computed value for `text-combine-upright: digits calc(6 / 2)` is `digits 3` assert_equals: expected "digits 3" but got "none"
     13FAIL Computed value for `text-combine-upright: digits calc(24 / 3 / 2)` is `digits 4` assert_equals: expected "digits 4" but got "none"
    1414

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-invalid-001-expected.txt

    r258661 r287487  
    11
    2 FAIL Computed value for `text-combine-upright: foo` is `none` assert_equals: expected (string) "none" but got (undefined) undefined
    3 FAIL Computed value for `text-combine-upright: all none` is `none` assert_equals: expected (string) "none" but got (undefined) undefined
    4 FAIL Computed value for `text-combine-upright: none digits` is `none` assert_equals: expected (string) "none" but got (undefined) undefined
    5 FAIL Computed value for `text-combine-upright: digits bar` is `none` assert_equals: expected (string) "none" but got (undefined) undefined
    6 FAIL Computed value for `text-combine-upright: digits 4 none` is `none` assert_equals: expected (string) "none" but got (undefined) undefined
    7 FAIL Computed value for `text-combine-upright: digits2` is `none` assert_equals: expected (string) "none" but got (undefined) undefined
    8 FAIL Computed value for `text-combine-upright: digits 1` is `none` assert_equals: expected (string) "none" but got (undefined) undefined
    9 FAIL Computed value for `text-combine-upright: digits +5` is `none` assert_equals: expected (string) "none" but got (undefined) undefined
    10 FAIL Computed value for `text-combine-upright: digits 2.00` is `none` assert_equals: expected (string) "none" but got (undefined) undefined
    11 FAIL Computed value for `text-combine-upright: digits 2e0` is not `digits 2` but `none` assert_equals: expected (string) "none" but got (undefined) undefined
    12 FAIL Computed value for `text-combine-upright: digits +2e0` is not `digits 2` but `none` assert_equals: expected (string) "none" but got (undefined) undefined
    13 FAIL Computed value for `text-combine-upright: digits 3e+0` is not `digits 3` but `none` assert_equals: expected (string) "none" but got (undefined) undefined
    14 FAIL Computed value for `text-combine-upright: digits 3e-0` is not `digits 3` but `none` assert_equals: expected (string) "none" but got (undefined) undefined
    15 FAIL Computed value for `text-combine-upright: digits +4e+0` is not `digits 4` but `none` assert_equals: expected (string) "none" but got (undefined) undefined
    16 FAIL Computed value for `text-combine-upright: digits +4e-0` is not `digits 4` but `none` assert_equals: expected (string) "none" but got (undefined) undefined
     2PASS Computed value for `text-combine-upright: foo` is `none`
     3PASS Computed value for `text-combine-upright: all none` is `none`
     4PASS Computed value for `text-combine-upright: none digits` is `none`
     5PASS Computed value for `text-combine-upright: digits bar` is `none`
     6PASS Computed value for `text-combine-upright: digits 4 none` is `none`
     7PASS Computed value for `text-combine-upright: digits2` is `none`
     8PASS Computed value for `text-combine-upright: digits 1` is `none`
     9PASS Computed value for `text-combine-upright: digits +5` is `none`
     10PASS Computed value for `text-combine-upright: digits 2.00` is `none`
     11PASS Computed value for `text-combine-upright: digits 2e0` is not `digits 2` but `none`
     12PASS Computed value for `text-combine-upright: digits +2e0` is not `digits 2` but `none`
     13PASS Computed value for `text-combine-upright: digits 3e+0` is not `digits 3` but `none`
     14PASS Computed value for `text-combine-upright: digits 3e-0` is not `digits 3` but `none`
     15PASS Computed value for `text-combine-upright: digits +4e+0` is not `digits 4` but `none`
     16PASS Computed value for `text-combine-upright: digits +4e-0` is not `digits 4` but `none`
    1717

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-invalid-002-expected.txt

    r258661 r287487  
    11
    2 FAIL Computed value for `text-combine-upright: digits calc(0 + 1)` is `none` assert_equals: expected (string) "none" but got (undefined) undefined
    3 FAIL Computed value for `text-combine-upright: digits calc(2 + 3)` is `none` assert_equals: expected (string) "none" but got (undefined) undefined
    4 FAIL Computed value for `text-combine-upright: digits calc(4 - 3)` is `none` assert_equals: expected (string) "none" but got (undefined) undefined
    5 FAIL Computed value for `text-combine-upright: digits calc(10 - 3)` is `none` assert_equals: expected (string) "none" but got (undefined) undefined
    6 FAIL Computed value for `text-combine-upright: digits calc(3 * 1.0)` is `none` assert_equals: expected (string) "none" but got (undefined) undefined
    7 FAIL Computed value for `text-combine-upright: digits calc(2.0 * 2)` is `none` assert_equals: expected (string) "none" but got (undefined) undefined
    8 FAIL Computed value for `text-combine-upright: digits calc(2 / 1.0)` is `none` assert_equals: expected (string) "none" but got (undefined) undefined
    9 FAIL Computed value for `text-combine-upright: digits calc(4.0 / 2)` is `none` assert_equals: expected (string) "none" but got (undefined) undefined
    10 FAIL Computed value for `text-combine-upright: digits calc(2e0 * 2e+0)` is `none` assert_equals: expected (string) "none" but got (undefined) undefined
    11 FAIL Computed value for `text-combine-upright: digits calc(2e2 * 2e-2)` is `none` assert_equals: expected (string) "none" but got (undefined) undefined
    12 FAIL Computed value for `text-combine-upright: digits calc(4e+2 / +2e2)` is `none` assert_equals: expected (string) "none" but got (undefined) undefined
     2PASS Computed value for `text-combine-upright: digits calc(0 + 1)` is `none`
     3PASS Computed value for `text-combine-upright: digits calc(2 + 3)` is `none`
     4PASS Computed value for `text-combine-upright: digits calc(4 - 3)` is `none`
     5PASS Computed value for `text-combine-upright: digits calc(10 - 3)` is `none`
     6PASS Computed value for `text-combine-upright: digits calc(3 * 1.0)` is `none`
     7PASS Computed value for `text-combine-upright: digits calc(2.0 * 2)` is `none`
     8PASS Computed value for `text-combine-upright: digits calc(2 / 1.0)` is `none`
     9PASS Computed value for `text-combine-upright: digits calc(4.0 / 2)` is `none`
     10PASS Computed value for `text-combine-upright: digits calc(2e0 * 2e+0)` is `none`
     11PASS Computed value for `text-combine-upright: digits calc(2e2 * 2e-2)` is `none`
     12PASS Computed value for `text-combine-upright: digits calc(4e+2 / +2e2)` is `none`
    1313

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-valid-001-expected.txt

    r258661 r287487  
    11
    2 FAIL Computed value for `text-combine-upright: none` is `none` assert_equals: expected (string) "none" but got (undefined) undefined
    3 FAIL Computed value for `text-combine-upright: all` is `all` assert_equals: expected (string) "all" but got (undefined) undefined
    4 FAIL Computed value for `text-combine-upright: initial` is `none` assert_equals: expected (string) "none" but got (undefined) undefined
    5 FAIL Computed value for `text-combine-upright: inherit` is `all` which is inherited from the parent element assert_equals: expected (string) "all" but got (undefined) undefined
    6 FAIL Computed value for `text-combine-upright: unset` is `all` which is inherited from the parent element assert_equals: expected (string) "all" but got (undefined) undefined
     2PASS Computed value for `text-combine-upright: none` is `none`
     3PASS Computed value for `text-combine-upright: all` is `all`
     4PASS Computed value for `text-combine-upright: initial` is `none`
     5PASS Computed value for `text-combine-upright: inherit` is `all` which is inherited from the parent element
     6PASS Computed value for `text-combine-upright: unset` is `all` which is inherited from the parent element
    77

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt

    r287433 r287487  
    11
    22PASS getComputedStyle returns no style for detached element
    3 FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) assert_equals: expected 0 but got 394
    4 FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 394
    5 FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 394
    6 FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 394
     3FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) assert_equals: expected 0 but got 395
     4FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 395
     5FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 395
     6FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 395
    77PASS getComputedStyle returns no style for shadow tree outside of flattened tree
    88

  • trunk/LayoutTests/platform/glib/fast/css/getComputedStyle/computed-style-expected.txt

    r287434 r287487  
    172172text-align: start;
    173173text-anchor: start;
     174text-combine-upright: none;
    174175text-decoration: none;
    175176text-emphasis-color: rgb(0, 0, 0);
    … …  
    246247-webkit-print-color-adjust: economy;
    247248-webkit-rtl-ordering: logical;
    248 -webkit-text-combine: none;
    249249-webkit-text-fill-color: rgb(0, 0, 0);
    250250-webkit-text-orientation: mixed;

  • trunk/LayoutTests/platform/glib/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

    r287434 r287487  
    171171text-align: start
    172172text-anchor: start
     173text-combine-upright: none
    173174text-decoration: none
    174175text-emphasis-color: rgb(0, 0, 0)
    … …  
    245246-webkit-print-color-adjust: economy
    246247-webkit-rtl-ordering: logical
    247 -webkit-text-combine: none
    248248-webkit-text-fill-color: rgb(0, 0, 0)
    249249-webkit-text-orientation: mixed

  • trunk/LayoutTests/platform/glib/svg/css/getComputedStyle-basic-expected.txt

    r287434 r287487  
    341341rect: style.getPropertyValue(text-anchor) : start
    342342rect: style.getPropertyCSSValue(text-anchor) : [object CSSPrimitiveValue]
     343rect: style.getPropertyValue(text-combine-upright) : none
     344rect: style.getPropertyCSSValue(text-combine-upright) : [object CSSPrimitiveValue]
    343345rect: style.getPropertyValue(text-decoration) : none
    344346rect: style.getPropertyCSSValue(text-decoration) : [object CSSPrimitiveValue]
    … …  
    489491rect: style.getPropertyValue(-webkit-rtl-ordering) : logical
    490492rect: style.getPropertyCSSValue(-webkit-rtl-ordering) : [object CSSPrimitiveValue]
    491 rect: style.getPropertyValue(-webkit-text-combine) : none
    492 rect: style.getPropertyCSSValue(-webkit-text-combine) : [object CSSPrimitiveValue]
    493493rect: style.getPropertyValue(-webkit-text-fill-color) : rgb(0, 0, 0)
    494494rect: style.getPropertyCSSValue(-webkit-text-fill-color) : [object CSSPrimitiveValue]
    … …  
    851851g: style.getPropertyValue(text-anchor) : start
    852852g: style.getPropertyCSSValue(text-anchor) : [object CSSPrimitiveValue]
     853g: style.getPropertyValue(text-combine-upright) : none
     854g: style.getPropertyCSSValue(text-combine-upright) : [object CSSPrimitiveValue]
    853855g: style.getPropertyValue(text-decoration) : none
    854856g: style.getPropertyCSSValue(text-decoration) : [object CSSPrimitiveValue]
    … …  
    9991001g: style.getPropertyValue(-webkit-rtl-ordering) : logical
    10001002g: style.getPropertyCSSValue(-webkit-rtl-ordering) : [object CSSPrimitiveValue]
    1001 g: style.getPropertyValue(-webkit-text-combine) : none
    1002 g: style.getPropertyCSSValue(-webkit-text-combine) : [object CSSPrimitiveValue]
    10031003g: style.getPropertyValue(-webkit-text-fill-color) : rgb(0, 0, 0)
    10041004g: style.getPropertyCSSValue(-webkit-text-fill-color) : [object CSSPrimitiveValue]

  • trunk/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt

    r287433 r287487  
    11
    22PASS getComputedStyle returns no style for detached element
    3 FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) assert_equals: expected 0 but got 391
    4 FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 391
    5 FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 391
    6 FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 391
     3FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) assert_equals: expected 0 but got 392
     4FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 392
     5FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 392
     6FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 392
    77PASS getComputedStyle returns no style for shadow tree outside of flattened tree
    88

  • trunk/LayoutTests/platform/ios/fast/css/getComputedStyle/computed-style-expected.txt

    r287434 r287487  
    172172text-align: start;
    173173text-anchor: start;
     174text-combine-upright: none;
    174175text-decoration: none;
    175176text-emphasis-color: rgb(0, 0, 0);
    … …  
    246247-webkit-print-color-adjust: economy;
    247248-webkit-rtl-ordering: logical;
    248 -webkit-text-combine: none;
    249249-webkit-text-fill-color: rgb(0, 0, 0);
    250250-webkit-text-orientation: mixed;

  • trunk/LayoutTests/platform/ios/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

    r287434 r287487  
    171171text-align: start
    172172text-anchor: start
     173text-combine-upright: none
    173174text-decoration: none
    174175text-emphasis-color: rgb(0, 0, 0)
    … …  
    245246-webkit-print-color-adjust: economy
    246247-webkit-rtl-ordering: logical
    247 -webkit-text-combine: none
    248248-webkit-text-fill-color: rgb(0, 0, 0)
    249249-webkit-text-orientation: mixed

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

    r287434 r287487  
    254254PASS text-align
    255255PASS text-anchor
     256PASS text-combine-upright
    256257PASS text-decoration
    257258PASS text-decoration-color
    … …  
    362363PASS -webkit-rtl-ordering
    363364PASS -webkit-ruby-position
    364 PASS -webkit-text-combine
    365365PASS -webkit-text-fill-color
    366366PASS -webkit-text-orientation

  • trunk/LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt

    r287433 r287487  
    11
    22PASS getComputedStyle returns no style for detached element
    3 FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) assert_equals: expected 0 but got 396
    4 FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 396
    5 FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 396
    6 FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 396
     3FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) assert_equals: expected 0 but got 397
     4FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 397
     5FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 397
     6FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 397
    77PASS getComputedStyle returns no style for shadow tree outside of flattened tree
    88

  • trunk/LayoutTests/platform/ios/svg/css/getComputedStyle-basic-expected.txt

    r287434 r287487  
    341341rect: style.getPropertyValue(text-anchor) : start
    342342rect: style.getPropertyCSSValue(text-anchor) : [object CSSPrimitiveValue]
     343rect: style.getPropertyValue(text-combine-upright) : none
     344rect: style.getPropertyCSSValue(text-combine-upright) : [object CSSPrimitiveValue]
    343345rect: style.getPropertyValue(text-decoration) : none
    344346rect: style.getPropertyCSSValue(text-decoration) : [object CSSPrimitiveValue]
    … …  
    489491rect: style.getPropertyValue(-webkit-rtl-ordering) : logical
    490492rect: style.getPropertyCSSValue(-webkit-rtl-ordering) : [object CSSPrimitiveValue]
    491 rect: style.getPropertyValue(-webkit-text-combine) : none
    492 rect: style.getPropertyCSSValue(-webkit-text-combine) : [object CSSPrimitiveValue]
    493493rect: style.getPropertyValue(-webkit-text-fill-color) : rgb(0, 0, 0)
    494494rect: style.getPropertyCSSValue(-webkit-text-fill-color) : [object CSSPrimitiveValue]
    … …  
    851851g: style.getPropertyValue(text-anchor) : start
    852852g: style.getPropertyCSSValue(text-anchor) : [object CSSPrimitiveValue]
     853g: style.getPropertyValue(text-combine-upright) : none
     854g: style.getPropertyCSSValue(text-combine-upright) : [object CSSPrimitiveValue]
    853855g: style.getPropertyValue(text-decoration) : none
    854856g: style.getPropertyCSSValue(text-decoration) : [object CSSPrimitiveValue]
    … …  
    9991001g: style.getPropertyValue(-webkit-rtl-ordering) : logical
    10001002g: style.getPropertyCSSValue(-webkit-rtl-ordering) : [object CSSPrimitiveValue]
    1001 g: style.getPropertyValue(-webkit-text-combine) : none
    1002 g: style.getPropertyCSSValue(-webkit-text-combine) : [object CSSPrimitiveValue]
    10031003g: style.getPropertyValue(-webkit-text-fill-color) : rgb(0, 0, 0)
    10041004g: style.getPropertyCSSValue(-webkit-text-fill-color) : [object CSSPrimitiveValue]

  • trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt

    r287433 r287487  
    11
    22PASS getComputedStyle returns no style for detached element
    3 FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) assert_equals: expected 0 but got 390
    4 FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 390
    5 FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 390
    6 FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 390
     3FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) assert_equals: expected 0 but got 391
     4FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 391
     5FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 391
     6FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 391
    77PASS getComputedStyle returns no style for shadow tree outside of flattened tree
    88

  • trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt

    r287460 r287487  
    341341rect: style.getPropertyValue(text-anchor) : start
    342342rect: style.getPropertyCSSValue(text-anchor) : [object CSSPrimitiveValue]
     343rect: style.getPropertyValue(text-combine-upright) : none
     344rect: style.getPropertyCSSValue(text-combine-upright) : [object CSSPrimitiveValue]
    343345rect: style.getPropertyValue(text-decoration) : none
    344346rect: style.getPropertyCSSValue(text-decoration) : [object CSSPrimitiveValue]
    … …  
    489491rect: style.getPropertyValue(-webkit-rtl-ordering) : logical
    490492rect: style.getPropertyCSSValue(-webkit-rtl-ordering) : [object CSSPrimitiveValue]
    491 rect: style.getPropertyValue(-webkit-text-combine) : none
    492 rect: style.getPropertyCSSValue(-webkit-text-combine) : [object CSSPrimitiveValue]
    493493rect: style.getPropertyValue(-webkit-text-fill-color) : rgb(0, 0, 0)
    494494rect: style.getPropertyCSSValue(-webkit-text-fill-color) : [object CSSPrimitiveValue]
    … …  
    851851g: style.getPropertyValue(text-anchor) : start
    852852g: style.getPropertyCSSValue(text-anchor) : [object CSSPrimitiveValue]
     853g: style.getPropertyValue(text-combine-upright) : none
     854g: style.getPropertyCSSValue(text-combine-upright) : [object CSSPrimitiveValue]
    853855g: style.getPropertyValue(text-decoration) : none
    854856g: style.getPropertyCSSValue(text-decoration) : [object CSSPrimitiveValue]
    … …  
    9991001g: style.getPropertyValue(-webkit-rtl-ordering) : logical
    10001002g: style.getPropertyCSSValue(-webkit-rtl-ordering) : [object CSSPrimitiveValue]
    1001 g: style.getPropertyValue(-webkit-text-combine) : none
    1002 g: style.getPropertyCSSValue(-webkit-text-combine) : [object CSSPrimitiveValue]
    10031003g: style.getPropertyValue(-webkit-text-fill-color) : rgb(0, 0, 0)
    10041004g: style.getPropertyCSSValue(-webkit-text-fill-color) : [object CSSPrimitiveValue]

  • trunk/Source/WebCore/ChangeLog

    r287486 r287487  
     12021-12-27  Tim Nguyen  <ntim@apple.com>
     2
     3        Implement text-combine-upright property
     4        https://bugs.webkit.org/show_bug.cgi?id=150821
     5
     6        Reviewed by Dean Jackson.
     7
     8        webkit.org/b/234694 and webkit.org/b/234707 are landed for this initial version of text-combine-upright.
     9
     10        To reach Chrome parity, layout needs to be tweaked (webkit.org/b/234704), and pseudo elements need to be properly supported (webkit.org/b/234705).
     11
     12        To reach standards parity, it also needs the digits syntax to be implemented (webkit.org/b/234706), which no browser implements yet.
     13
     14        * css/CSSComputedStyleDeclaration.cpp:
     15        (WebCore::ComputedStyleExtractor::valueForPropertyInStyle):
     16        * css/CSSPrimitiveValueMappings.h:
     17        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
     18        (WebCore::CSSPrimitiveValue::operator TextCombine const):
     19        * css/CSSProperties.json:
     20        * css/CSSValueKeywords.in:
     21        * css/parser/CSSParserFastPaths.cpp:
     22        (WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
     23        (WebCore::CSSParserFastPaths::isKeywordPropertyID):
     24        * rendering/LegacyLineLayout.cpp:
     25        (WebCore::expansionBehaviorForInlineTextBox):
     26        * rendering/style/RenderStyleConstants.cpp:
     27        (WebCore::operator<<):
     28        * rendering/style/RenderStyleConstants.h:
     29        * style/PropertyAllowlist.cpp:
     30        (WebCore::Style::isValidMarkerStyleProperty):
     31        Allow setting text-combine-upright on ::marker.
     32
    1332021-12-30  Adrian Perez de Castro  <aperez@igalia.com>
    234

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

    r287434 r287487  
    38443844            return cssValuePool.createValue(style.writingMode());
    38453845        case CSSPropertyWebkitTextCombine:
     3846            if (style.textCombine() == TextCombine::All)
     3847                return CSSPrimitiveValue::createIdentifier(CSSValueHorizontal);
     3848            return nullptr;
     3849        case CSSPropertyTextCombineUpright:
    38463850            return cssValuePool.createValue(style.textCombine());
    38473851        case CSSPropertyWebkitTextOrientation:

  • trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h

    r287429 r287487  
    31033103        m_value.valueID = CSSValueNone;
    31043104        break;
    3105     case TextCombine::Horizontal:
    3106         m_value.valueID = CSSValueHorizontal;
     3105    case TextCombine::All:
     3106        m_value.valueID = CSSValueAll;
    31073107        break;
    31083108    }
    … …  
    31163116    case CSSValueNone:
    31173117        return TextCombine::None;
    3118     case CSSValueHorizontal:
    3119         return TextCombine::Horizontal;
     3118    case CSSValueAll:
     3119    case CSSValueHorizontal: // -webkit-text-combine only
     3120        return TextCombine::All;
    31203121    default:
    31213122        break;

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

    r287446 r287487  
    66266626                ]
    66276627            },
    6628             "status": "non-standard"
     6628            "status": {
     6629                "status": "obsolete",
     6630                "comment": "Use text-combine-upright instead."
     6631            }
     6632        },
     6633        "text-combine-upright": {
     6634            "inherited": true,
     6635            "codegen-properties": {
     6636                "name-for-methods": "TextCombine"
     6637            },
     6638            "values": [
     6639                "none",
     6640                "all"
     6641            ],
     6642            "specification": {
     6643                "category": "css-writing-modes",
     6644                "url": "https://www.w3.org/TR/css-writing-modes-3/#propdef-direction"
     6645            }
    66296646        },
    66306647        "-webkit-text-align-last": {

  • trunk/Source/WebCore/css/CSSValueKeywords.in

    r287356 r287487  
    11151115inter-character
    11161116
     1117// -webkit-text-combine
     1118// horizontal
     1119
     1120// text-combine-upright
     1121// all
     1122// none
     1123
    11171124// text-emphasis-position
    11181125over

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

    r287434 r287487  
    811811    case CSSPropertyWebkitTextCombine:
    812812        return valueID == CSSValueNone || valueID == CSSValueHorizontal;
     813    case CSSPropertyTextCombineUpright:
     814        return valueID == CSSValueNone || valueID == CSSValueAll;
    813815    case CSSPropertyWebkitTextSecurity: // disc | circle | square | none
    814816        return valueID == CSSValueDisc || valueID == CSSValueCircle || valueID == CSSValueSquare || valueID == CSSValueNone;
    … …  
    977979    case CSSPropertyWebkitRubyPosition:
    978980    case CSSPropertyWebkitTextCombine:
     981    case CSSPropertyTextCombineUpright:
    979982    case CSSPropertyTextDecorationStyle:
    980983    case CSSPropertyWebkitTextOrientation:

  • trunk/Source/WebCore/rendering/LegacyLineLayout.cpp

    r286113 r287487  
    723723{
    724724    // Tatechuyoko is modeled as the Object Replacement Character (U+FFFC), which can never have expansion opportunities inside nor intrinsically adjacent to it.
    725     if (textBox.renderer().style().textCombine() == TextCombine::Horizontal)
     725    if (textBox.renderer().style().textCombine() == TextCombine::All)
    726726        return ForbidLeftExpansion | ForbidRightExpansion;
    727727

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

    r287429 r287487  
    10331033    switch (textCombine) {
    10341034    case TextCombine::None: ts << "none"; break;
    1035     case TextCombine::Horizontal: ts << "horizontal"; break;
     1035    case TextCombine::All: ts << "all"; break;
    10361036    }
    10371037    return ts;

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

    r287429 r287487  
    314314enum class TextCombine : uint8_t {
    315315    None,
    316     Horizontal
     316    All
    317317};
    318318

  • trunk/Source/WebCore/style/PropertyAllowlist.cpp

    r287356 r287487  
    7070    case CSSPropertyOverflowWrap:
    7171    case CSSPropertyTabSize:
     72    case CSSPropertyTextCombineUpright:
    7273    case CSSPropertyTextDecorationSkipInk:
    7374    case CSSPropertyTextEmphasis:
Note: See TracChangeset for help on using the changeset viewer.