Changeset 213094 in webkit


Ignore:
Timestamp:
Feb 27, 2017 2:41:08 PM (7 years ago)
Author:
mmaxfield@apple.com
Message:

Unprefix -webkit-line-break
​https://bugs.webkit.org/show_bug.cgi?id=168213

Reviewed by Darin Adler.

Source/WebCore:

We support the property as specced.

Test: fast/text/line-break-unprefixed.html

  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::ComputedStyleExtractor::propertyValue):

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

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

  • editing/Editor.cpp:

(WebCore::Editor::applyEditingStyleToElement):

  • html/HTMLElement.cpp:

(WebCore::HTMLElement::collectStyleForPresentationAttribute):

LayoutTests:

Updating expected results.

  • fast/css/getComputedStyle/computed-style-expected.txt:
  • fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • fast/text/line-break-unprefixed.html: Added.
  • fast/text/line-break-unprefixed-expected.html: Added.
  • svg/css/getComputedStyle-basic-expected.txt:
Location:
trunk
Files:
2 added
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r213092 r213094  
     12017-02-27  Myles C. Maxfield  <mmaxfield@apple.com>
     2
     3        Unprefix -webkit-line-break
     4        https://bugs.webkit.org/show_bug.cgi?id=168213
     5
     6        Reviewed by Darin Adler.
     7
     8        Updating expected results.
     9
     10        * fast/css/getComputedStyle/computed-style-expected.txt:
     11        * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     12        * fast/text/line-break-unprefixed.html: Added.
     13        * fast/text/line-break-unprefixed-expected.html: Added.
     14        * svg/css/getComputedStyle-basic-expected.txt:
     15
    1162017-02-27  Ryan Haddad  <ryanhaddad@apple.com>
    217

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

    r212131 r213094  
    190190-webkit-line-align: none;
    191191-webkit-line-box-contain: block inline replaced;
    192 -webkit-line-break: auto;
    193192-webkit-line-clamp: none;
    194193-webkit-line-grid: none;

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

    r212131 r213094  
    189189-webkit-line-align: none
    190190-webkit-line-box-contain: block inline replaced
    191 -webkit-line-break: auto
    192191-webkit-line-clamp: none
    193192-webkit-line-grid: none

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

    r212131 r213094  
    377377rect: style.getPropertyValue(-webkit-line-box-contain) : block inline replaced
    378378rect: style.getPropertyCSSValue(-webkit-line-box-contain) : [object CSSValue]
    379 rect: style.getPropertyValue(-webkit-line-break) : auto
    380 rect: style.getPropertyCSSValue(-webkit-line-break) : [object CSSPrimitiveValue]
    381379rect: style.getPropertyValue(-webkit-line-clamp) : none
    382380rect: style.getPropertyCSSValue(-webkit-line-clamp) : [object CSSPrimitiveValue]
    … …  
    931929g: style.getPropertyValue(-webkit-line-box-contain) : block inline replaced
    932930g: style.getPropertyCSSValue(-webkit-line-box-contain) : [object CSSValue]
    933 g: style.getPropertyValue(-webkit-line-break) : auto
    934 g: style.getPropertyCSSValue(-webkit-line-break) : [object CSSPrimitiveValue]
    935931g: style.getPropertyValue(-webkit-line-clamp) : none
    936932g: style.getPropertyCSSValue(-webkit-line-clamp) : [object CSSPrimitiveValue]

  • trunk/Source/WebCore/ChangeLog

    r213093 r213094  
     12017-02-27  Myles C. Maxfield  <mmaxfield@apple.com>
     2
     3        Unprefix -webkit-line-break
     4        https://bugs.webkit.org/show_bug.cgi?id=168213
     5
     6        Reviewed by Darin Adler.
     7
     8        We support the property as specced.
     9
     10        Test: fast/text/line-break-unprefixed.html
     11
     12        * css/CSSComputedStyleDeclaration.cpp:
     13        (WebCore::ComputedStyleExtractor::propertyValue):
     14        * css/CSSProperties.json:
     15        * css/parser/CSSParserFastPaths.cpp:
     16        (WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
     17        (WebCore::CSSParserFastPaths::isKeywordPropertyID):
     18        * editing/Editor.cpp:
     19        (WebCore::Editor::applyEditingStyleToElement):
     20        * html/HTMLElement.cpp:
     21        (WebCore::HTMLElement::collectStyleForPresentationAttribute):
     22
    1232017-02-27  Myles C. Maxfield  <mmaxfield@apple.com>
    224

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

    r212985 r213094  
    355355    CSSPropertyWebkitLineAlign,
    356356    CSSPropertyWebkitLineBoxContain,
    357     CSSPropertyWebkitLineBreak,
     357    CSSPropertyLineBreak,
    358358    CSSPropertyWebkitLineClamp,
    359359    CSSPropertyWebkitLineGrid,
    … …  
    33153315        case CSSPropertyWordWrap:
    33163316            return cssValuePool.createValue(style->overflowWrap());
    3317         case CSSPropertyWebkitLineBreak:
     3317        case CSSPropertyLineBreak:
    33183318            return cssValuePool.createValue(style->lineBreak());
    33193319        case CSSPropertyWebkitNbspMode:

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

    r213082 r213094  
    49294929            }
    49304930        },
    4931         "-webkit-line-break": {
     4931        "line-break": {
    49324932            "inherited": true,
    49334933            "values": [
    … …  
    49384938                {
    49394939                    "value": "after-white-space",
    4940                     "status": "non-standard"
     4940                    "status": "non-standard",
     4941                    "comment": "Added in https://trac.webkit.org/changeset/7763"
    49414942                }
    49424943            ],
    4943             "status": {
    4944                 "status": "experimental"
    4945             },
    49464944            "specification": {
    49474945                "category": "css-text",
    49484946                "url": "https://www.w3.org/TR/css-text-3/#line-break"
     4947            },
     4948            "codegen-properties": {
     4949                "aliases": [
     4950                    "-webkit-line-break"
     4951                ]
    49494952            }
    49504953        },

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

    r212629 r213094  
    722722    case CSSPropertyWebkitLineAlign:
    723723        return valueID == CSSValueNone || valueID == CSSValueEdges;
    724     case CSSPropertyWebkitLineBreak: // auto | loose | normal | strict | after-white-space
     724    case CSSPropertyLineBreak: // auto | loose | normal | strict | after-white-space
    725725        return valueID == CSSValueAuto || valueID == CSSValueLoose || valueID == CSSValueNormal || valueID == CSSValueStrict || valueID == CSSValueAfterWhiteSpace;
    726726    case CSSPropertyWebkitLineSnap:
    … …  
    882882    case CSSPropertyWebkitHyphens:
    883883    case CSSPropertyWebkitLineAlign:
    884     case CSSPropertyWebkitLineBreak:
     884    case CSSPropertyLineBreak:
    885885    case CSSPropertyWebkitLineSnap:
    886886    case CSSPropertyWebkitMarginAfterCollapse:

  • trunk/Source/WebCore/editing/Editor.cpp

    r212681 r213094  
    31073107    style->setPropertyInternal(CSSPropertyWordWrap, "break-word", false);
    31083108    style->setPropertyInternal(CSSPropertyWebkitNbspMode, "space", false);
    3109     style->setPropertyInternal(CSSPropertyWebkitLineBreak, "after-white-space", false);
     3109    style->setPropertyInternal(CSSPropertyLineBreak, "after-white-space", false);
    31103110}
    31113111

  • trunk/Source/WebCore/html/HTMLElement.cpp

    r211965 r213094  
    184184            addPropertyToPresentationAttributeStyle(style, CSSPropertyWordWrap, CSSValueBreakWord);
    185185            addPropertyToPresentationAttributeStyle(style, CSSPropertyWebkitNbspMode, CSSValueSpace);
    186             addPropertyToPresentationAttributeStyle(style, CSSPropertyWebkitLineBreak, CSSValueAfterWhiteSpace);
     186            addPropertyToPresentationAttributeStyle(style, CSSPropertyLineBreak, CSSValueAfterWhiteSpace);
    187187#if PLATFORM(IOS)
    188188            addPropertyToPresentationAttributeStyle(style, CSSPropertyWebkitTextSizeAdjust, CSSValueNone);
Note: See TracChangeset for help on using the changeset viewer.