Changeset 285615 in webkit


Ignore:
Timestamp:
Nov 10, 2021 4:47:14 PM (8 months ago)
Author:
ntim@apple.com
Message:

Remove non-standard -webkit-border-fit CSS property
​https://bugs.webkit.org/show_bug.cgi?id=229564

Reviewed by Simon Fraser.

LayoutTests/imported/w3c:

  • web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
  • web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:

Source/WebCore:

  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::ComputedStyleExtractor::valueForPropertyInStyle):

  • css/CSSPrimitiveValueMappings.h:

(WebCore::CSSPrimitiveValue::operator BorderFit const): Deleted.

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

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

  • rendering/RenderBlockFlow.cpp:

(WebCore::RenderBlockFlow::layoutBlock):
(WebCore::RenderBlockFlow::adjustForBorderFit const): Deleted.
(WebCore::RenderBlockFlow::fitBorderToLinesIfNeeded): Deleted.

  • rendering/RenderBlockFlow.h:
  • rendering/RenderBox.cpp:

(WebCore::RenderBox::computeLogicalWidthInFragment const):

  • rendering/RenderElement.cpp:

(WebCore::RenderElement::repaintAfterLayoutIfNeeded):

  • rendering/style/RenderStyle.cpp:

(WebCore::rareNonInheritedDataChangeRequiresRepaint):

  • rendering/style/RenderStyle.h:

(WebCore::RenderStyle::borderFit const): Deleted.
(WebCore::RenderStyle::setBorderFit): Deleted.
(WebCore::RenderStyle::initialBorderFit): Deleted.

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

(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):

Source/WebInspectorUI:

  • UserInterface/Models/CSSKeywordCompletions.js:

Tools:

  • LayoutReloaded/misc/LFC-passing-tests.txt:

LayoutTests:

Remove relevant tests and update test expectations.

  • TestExpectations:
  • fast/block/border-fit-with-right-alignment-expected.html: Removed.
  • fast/block/border-fit-with-right-alignment.html: Removed.
  • fast/borders/border-fit-2-expected.txt: Removed.
  • fast/borders/border-fit-2.html: Removed.
  • fast/borders/border-fit-expected.txt: Removed.
  • fast/borders/border-fit.html: Removed.
  • fast/css/getComputedStyle/computed-style-expected.txt:
  • fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • fast/css/getComputedStyle/resources/property-names.js:
  • fast/multicol/widow-relayout-with-border-fit-expected.txt: Removed.
  • fast/multicol/widow-relayout-with-border-fit.html: Removed.
  • fast/repaint/border-fit-lines-expected.html: Removed.
  • fast/repaint/border-fit-lines.html: Removed.
  • platform/glib/fast/borders/border-fit-expected.txt: Removed.
  • platform/glib/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • platform/glib/svg/css/getComputedStyle-basic-expected.txt:
  • platform/gtk/fast/borders/border-fit-2-expected.png: Removed.
  • platform/gtk/fast/borders/border-fit-expected.png: Removed.
  • platform/gtk/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:
  • platform/ios/TestExpectations:
  • 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/mac/TestExpectations:
  • platform/mac/fast/borders/border-fit-2-expected.png: Removed.
  • platform/mac/fast/borders/border-fit-expected.png: Removed.
  • platform/mac/fast/css/getComputedStyle/computed-style-expected.txt:
  • platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • platform/mac/svg/css/getComputedStyle-basic-expected.txt:
  • platform/win/fast/borders/border-fit-expected.txt: Removed.
  • platform/wpe/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:
  • svg/css/getComputedStyle-basic-expected.txt:
Location:
trunk
Files:
16 deleted
42 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r285610 r285615  
     12021-11-10  Tim Nguyen  <ntim@apple.com>
     2
     3        Remove non-standard -webkit-border-fit CSS property
     4        https://bugs.webkit.org/show_bug.cgi?id=229564
     5
     6        Reviewed by Simon Fraser.
     7
     8        Remove relevant tests and update test expectations.
     9
     10        * TestExpectations:
     11        * fast/block/border-fit-with-right-alignment-expected.html: Removed.
     12        * fast/block/border-fit-with-right-alignment.html: Removed.
     13        * fast/borders/border-fit-2-expected.txt: Removed.
     14        * fast/borders/border-fit-2.html: Removed.
     15        * fast/borders/border-fit-expected.txt: Removed.
     16        * fast/borders/border-fit.html: Removed.
     17        * fast/css/getComputedStyle/computed-style-expected.txt:
     18        * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     19        * fast/css/getComputedStyle/resources/property-names.js:
     20        * fast/multicol/widow-relayout-with-border-fit-expected.txt: Removed.
     21        * fast/multicol/widow-relayout-with-border-fit.html: Removed.
     22        * fast/repaint/border-fit-lines-expected.html: Removed.
     23        * fast/repaint/border-fit-lines.html: Removed.
     24        * platform/glib/fast/borders/border-fit-expected.txt: Removed.
     25        * platform/glib/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     26        * platform/glib/svg/css/getComputedStyle-basic-expected.txt:
     27        * platform/gtk/fast/borders/border-fit-2-expected.png: Removed.
     28        * platform/gtk/fast/borders/border-fit-expected.png: Removed.
     29        * platform/gtk/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:
     30        * platform/ios/TestExpectations:
     31        * platform/ios/fast/css/getComputedStyle/computed-style-expected.txt:
     32        * platform/ios/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     33        * platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
     34        * platform/ios/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:
     35        * platform/ios/svg/css/getComputedStyle-basic-expected.txt:
     36        * platform/mac/TestExpectations:
     37        * platform/mac/fast/borders/border-fit-2-expected.png: Removed.
     38        * platform/mac/fast/borders/border-fit-expected.png: Removed.
     39        * platform/mac/fast/css/getComputedStyle/computed-style-expected.txt:
     40        * platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     41        * platform/mac/svg/css/getComputedStyle-basic-expected.txt:
     42        * platform/win/fast/borders/border-fit-expected.txt: Removed.
     43        * platform/wpe/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:
     44        * svg/css/getComputedStyle-basic-expected.txt:
     45
    1462021-11-10  Devin Rousso  <drousso@apple.com>
    247

  • trunk/LayoutTests/TestExpectations

    r285597 r285615  
    48654865webkit.org/b/224899 imported/w3c/web-platform-tests/css/css-will-change/will-change-fixedpos-cb-005.html [ ImageOnlyFailure ]
    48664866
    4867 webkit.org/b/223170 [ Debug ] fast/multicol/widow-relayout-with-border-fit.html [ Skip ]
    48684867webkit.org/b/31278 [ Debug ] fast/multicol/spanner-get-re-added-on-move-crash.html [ Skip ]
    48694868

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

    r285383 r285615  
    199199-webkit-background-origin: padding-box;
    200200-webkit-background-size: auto;
    201 -webkit-border-fit: border;
    202201-webkit-border-horizontal-spacing: 0px;
    203202-webkit-border-image: none;

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

    r285383 r285615  
    198198-webkit-background-origin: padding-box
    199199-webkit-background-size: auto
    200 -webkit-border-fit: border
    201200-webkit-border-horizontal-spacing: 0px
    202201-webkit-border-image: none

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

    r284098 r285615  
    1818    "-webkit-background-origin": true,
    1919    "-webkit-background-size": true,
    20     "-webkit-border-fit": true,
    2120    "-webkit-border-horizontal-spacing": true,
    2221    "-webkit-border-image": true,

  • trunk/LayoutTests/imported/w3c/ChangeLog

    r285604 r285615  
     12021-11-10  Tim Nguyen  <ntim@apple.com>
     2
     3        Remove non-standard -webkit-border-fit CSS property
     4        https://bugs.webkit.org/show_bug.cgi?id=229564
     5
     6        Reviewed by Simon Fraser.
     7
     8        * web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
     9        * web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:
     10
    1112021-11-10  Antoine Quint  <graouts@webkit.org>
    212

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

    r285343 r285615  
    327327PASS -webkit-background-origin
    328328PASS -webkit-background-size
    329 PASS -webkit-border-fit
    330329PASS -webkit-border-horizontal-spacing
    331330PASS -webkit-border-image

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

    r285343 r285615  
    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 398
    4 FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 398
    5 FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 398
    6 FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 398
     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/glib/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

    r285383 r285615  
    198198-webkit-background-origin: padding-box
    199199-webkit-background-size: auto
    200 -webkit-border-fit: border
    201200-webkit-border-horizontal-spacing: 0px
    202201-webkit-border-image: none

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

    r285383 r285615  
    395395rect: style.getPropertyValue(-webkit-background-size) : auto
    396396rect: style.getPropertyCSSValue(-webkit-background-size) : [object CSSPrimitiveValue]
    397 rect: style.getPropertyValue(-webkit-border-fit) : border
    398 rect: style.getPropertyCSSValue(-webkit-border-fit) : [object CSSPrimitiveValue]
    399397rect: style.getPropertyValue(-webkit-border-horizontal-spacing) : 0px
    400398rect: style.getPropertyCSSValue(-webkit-border-horizontal-spacing) : [object CSSPrimitiveValue]
    … …  
    915913g: style.getPropertyValue(-webkit-background-size) : auto
    916914g: style.getPropertyCSSValue(-webkit-background-size) : [object CSSPrimitiveValue]
    917 g: style.getPropertyValue(-webkit-border-fit) : border
    918 g: style.getPropertyCSSValue(-webkit-border-fit) : [object CSSPrimitiveValue]
    919915g: style.getPropertyValue(-webkit-border-horizontal-spacing) : 0px
    920916g: style.getPropertyCSSValue(-webkit-border-horizontal-spacing) : [object CSSPrimitiveValue]

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

    r284839 r285615  
    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 393
     4FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 393
     5FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 393
     6FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 393
    77PASS getComputedStyle returns no style for shadow tree outside of flattened tree
    88

  • trunk/LayoutTests/platform/ios/TestExpectations

    r285597 r285615  
    15051505fast/block/positioning/offsetLeft-offsetTop-multicolumn.html [ ImageOnlyFailure ]
    15061506fast/block/positioning/relative-positioned-inline-container.html [ Failure ]
    1507 fast/borders/border-fit.html [ Failure ]
    15081507fast/borders/border-painting-correctness-dashed.html [ ImageOnlyFailure ]
    15091508fast/borders/border-painting-correctness-dotted.html [ ImageOnlyFailure ]

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

    r285383 r285615  
    199199-webkit-background-origin: padding-box;
    200200-webkit-background-size: auto;
    201 -webkit-border-fit: border;
    202201-webkit-border-horizontal-spacing: 0px;
    203202-webkit-border-image: none;

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

    r285383 r285615  
    198198-webkit-background-origin: padding-box
    199199-webkit-background-size: auto
    200 -webkit-border-fit: border
    201200-webkit-border-horizontal-spacing: 0px
    202201-webkit-border-image: none

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

    r270613 r285615  
    306306PASS -webkit-background-origin
    307307PASS -webkit-background-size
    308 PASS -webkit-border-fit
    309308PASS -webkit-border-horizontal-spacing
    310309PASS -webkit-border-image

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

    r285343 r285615  
    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 400
    4 FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 400
    5 FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 400
    6 FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 400
     3FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) assert_equals: expected 0 but got 399
     4FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 399
     5FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 399
     6FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 399
    77PASS getComputedStyle returns no style for shadow tree outside of flattened tree
    88

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

    r285383 r285615  
    395395rect: style.getPropertyValue(-webkit-background-size) : auto
    396396rect: style.getPropertyCSSValue(-webkit-background-size) : [object CSSPrimitiveValue]
    397 rect: style.getPropertyValue(-webkit-border-fit) : border
    398 rect: style.getPropertyCSSValue(-webkit-border-fit) : [object CSSPrimitiveValue]
    399397rect: style.getPropertyValue(-webkit-border-horizontal-spacing) : 0px
    400398rect: style.getPropertyCSSValue(-webkit-border-horizontal-spacing) : [object CSSPrimitiveValue]
    … …  
    915913g: style.getPropertyValue(-webkit-background-size) : auto
    916914g: style.getPropertyCSSValue(-webkit-background-size) : [object CSSPrimitiveValue]
    917 g: style.getPropertyValue(-webkit-border-fit) : border
    918 g: style.getPropertyCSSValue(-webkit-border-fit) : [object CSSPrimitiveValue]
    919915g: style.getPropertyValue(-webkit-border-horizontal-spacing) : 0px
    920916g: style.getPropertyCSSValue(-webkit-border-horizontal-spacing) : [object CSSPrimitiveValue]

  • trunk/LayoutTests/platform/mac/TestExpectations

    r285597 r285615  
    536536# Need support for ResourceHandle::didChangePriority and DRT support
    537537webkit.org/b/111016 http/tests/loading/promote-img-preload-priority.html [ Failure ]
    538 
    539 webkit.org/b/111606 fast/borders/border-fit-2.html [ Failure Pass ]
    540 webkit.org/b/111606 fast/borders/border-fit.html [ Failure Pass ]
    541 webkit.org/b/111606 fast/repaint/border-fit-lines.html [ Failure Pass ]
    542 
    543538
    544539# The following tests only fail on Mac EWS bots. Unfortunately, we haven't been able to figure out the cause of these failures.

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

    r285383 r285615  
    199199-webkit-background-origin: padding-box;
    200200-webkit-background-size: auto;
    201 -webkit-border-fit: border;
    202201-webkit-border-horizontal-spacing: 0px;
    203202-webkit-border-image: none;

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

    r285383 r285615  
    198198-webkit-background-origin: padding-box
    199199-webkit-background-size: auto
    200 -webkit-border-fit: border
    201200-webkit-border-horizontal-spacing: 0px
    202201-webkit-border-image: none

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

    r285383 r285615  
    395395rect: style.getPropertyValue(-webkit-background-size) : auto
    396396rect: style.getPropertyCSSValue(-webkit-background-size) : [object CSSPrimitiveValue]
    397 rect: style.getPropertyValue(-webkit-border-fit) : border
    398 rect: style.getPropertyCSSValue(-webkit-border-fit) : [object CSSPrimitiveValue]
    399397rect: style.getPropertyValue(-webkit-border-horizontal-spacing) : 0px
    400398rect: style.getPropertyCSSValue(-webkit-border-horizontal-spacing) : [object CSSPrimitiveValue]
    … …  
    915913g: style.getPropertyValue(-webkit-background-size) : auto
    916914g: style.getPropertyCSSValue(-webkit-background-size) : [object CSSPrimitiveValue]
    917 g: style.getPropertyValue(-webkit-border-fit) : border
    918 g: style.getPropertyCSSValue(-webkit-border-fit) : [object CSSPrimitiveValue]
    919915g: style.getPropertyValue(-webkit-border-horizontal-spacing) : 0px
    920916g: style.getPropertyCSSValue(-webkit-border-horizontal-spacing) : [object CSSPrimitiveValue]

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

    r285343 r285615  
    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 393
     4FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 393
     5FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 393
     6FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 393
    77PASS getComputedStyle returns no style for shadow tree outside of flattened tree
    88

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

    r285383 r285615  
    395395rect: style.getPropertyValue(-webkit-background-size) : auto
    396396rect: style.getPropertyCSSValue(-webkit-background-size) : [object CSSPrimitiveValue]
    397 rect: style.getPropertyValue(-webkit-border-fit) : border
    398 rect: style.getPropertyCSSValue(-webkit-border-fit) : [object CSSPrimitiveValue]
    399397rect: style.getPropertyValue(-webkit-border-horizontal-spacing) : 0px
    400398rect: style.getPropertyCSSValue(-webkit-border-horizontal-spacing) : [object CSSPrimitiveValue]
    … …  
    915913g: style.getPropertyValue(-webkit-background-size) : auto
    916914g: style.getPropertyCSSValue(-webkit-background-size) : [object CSSPrimitiveValue]
    917 g: style.getPropertyValue(-webkit-border-fit) : border
    918 g: style.getPropertyCSSValue(-webkit-border-fit) : [object CSSPrimitiveValue]
    919915g: style.getPropertyValue(-webkit-border-horizontal-spacing) : 0px
    920916g: style.getPropertyCSSValue(-webkit-border-horizontal-spacing) : [object CSSPrimitiveValue]

  • trunk/Source/WebCore/ChangeLog

    r285610 r285615  
     12021-11-10  Tim Nguyen  <ntim@apple.com>
     2
     3        Remove non-standard -webkit-border-fit CSS property
     4        https://bugs.webkit.org/show_bug.cgi?id=229564
     5
     6        Reviewed by Simon Fraser.
     7
     8        * css/CSSComputedStyleDeclaration.cpp:
     9        (WebCore::ComputedStyleExtractor::valueForPropertyInStyle):
     10        * css/CSSPrimitiveValueMappings.h:
     11        (WebCore::CSSPrimitiveValue::operator BorderFit const): Deleted.
     12        * css/CSSProperties.json:
     13        * css/CSSValueKeywords.in:
     14        * css/parser/CSSParserFastPaths.cpp:
     15        (WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
     16        (WebCore::CSSParserFastPaths::isKeywordPropertyID):
     17        * rendering/RenderBlockFlow.cpp:
     18        (WebCore::RenderBlockFlow::layoutBlock):
     19        (WebCore::RenderBlockFlow::adjustForBorderFit const): Deleted.
     20        (WebCore::RenderBlockFlow::fitBorderToLinesIfNeeded): Deleted.
     21        * rendering/RenderBlockFlow.h:
     22        * rendering/RenderBox.cpp:
     23        (WebCore::RenderBox::computeLogicalWidthInFragment const):
     24        * rendering/RenderElement.cpp:
     25        (WebCore::RenderElement::repaintAfterLayoutIfNeeded):
     26        * rendering/style/RenderStyle.cpp:
     27        (WebCore::rareNonInheritedDataChangeRequiresRepaint):
     28        * rendering/style/RenderStyle.h:
     29        (WebCore::RenderStyle::borderFit const): Deleted.
     30        (WebCore::RenderStyle::setBorderFit): Deleted.
     31        (WebCore::RenderStyle::initialBorderFit): Deleted.
     32        * rendering/style/RenderStyleConstants.cpp:
     33        * rendering/style/RenderStyleConstants.h:
     34        * rendering/style/StyleRareNonInheritedData.cpp:
     35        (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
     36
    1372021-11-10  Devin Rousso  <drousso@apple.com>
    238

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

    r285604 r285615  
    31043104                return CSSPrimitiveValue::createIdentifier(CSSValueNoLimit);
    31053105            return CSSPrimitiveValue::create(style.hyphenationLimitLines(), CSSUnitType::CSS_NUMBER);
    3106         case CSSPropertyWebkitBorderFit:
    3107             if (style.borderFit() == BorderFit::Border)
    3108                 return cssValuePool.createIdentifierValue(CSSValueBorder);
    3109             return cssValuePool.createIdentifierValue(CSSValueLines);
    31103106        case CSSPropertyImageOrientation:
    31113107            if (style.imageOrientation() == ImageOrientation::FromImage)

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

    r283858 r285615  
    41364136}
    41374137
    4138 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(BorderFit e)
    4139     : CSSValue(PrimitiveClass)
    4140 {
    4141     setPrimitiveUnitType(CSSUnitType::CSS_VALUE_ID);
    4142     switch (e) {
    4143     case BorderFit::Border:
    4144         m_value.valueID = CSSValueBorder;
    4145         break;
    4146     case BorderFit::Lines:
    4147         m_value.valueID = CSSValueLines;
    4148         break;
    4149     }
    4150 }
    4151 
    4152 template<> inline CSSPrimitiveValue::operator BorderFit() const
    4153 {
    4154     ASSERT(isValueID());
    4155 
    4156     switch (m_value.valueID) {
    4157     case CSSValueBorder:
    4158         return BorderFit::Border;
    4159     case CSSValueLines:
    4160         return BorderFit::Lines;
    4161     default:
    4162         break;
    4163     }
    4164 
    4165     ASSERT_NOT_REACHED();
    4166     return BorderFit::Lines;
    4167 }
    4168 
    41694138template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ImageRendering imageRendering)
    41704139    : CSSValue(PrimitiveClass)

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

    r285343 r285615  
    51045104            }
    51055105        },
    5106         "-webkit-border-fit": {
    5107             "values": [
    5108                 "border",
    5109                 "lines"
    5110             ],
    5111             "status": "non-standard"
    5112         },
    51135106        "-webkit-border-horizontal-spacing": {
    51145107            "inherited": true,

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

    r285493 r285615  
    964964
    965965//
    966 // CSS_PROP__WEBKIT_BORDER_FIT
    967 //
    968 lines
    969 
    970 //
    971966// CSS_PROP__WEBKIT_ANIMATION_DIRECTION
    972967//

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

    r285373 r285615  
    842842    case CSSPropertyWordBreak: // normal | break-all | keep-all | break-word (this is a custom extension)
    843843        return valueID == CSSValueNormal || valueID == CSSValueBreakAll || valueID == CSSValueKeepAll || valueID == CSSValueBreakWord;
    844     case CSSPropertyWebkitBorderFit:
    845         return valueID == CSSValueBorder || valueID == CSSValueLines;
    846844#if ENABLE(CSS_TRAILING_WORD)
    847845    case CSSPropertyAppleTrailingWord: // auto | -apple-partially-balanced
    … …  
    965963    case CSSPropertyAppearance:
    966964    case CSSPropertyBackfaceVisibility:
    967     case CSSPropertyWebkitBorderFit:
    968965    case CSSPropertyWebkitBoxAlign:
    969966    case CSSPropertyWebkitBoxDirection:

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

    r285162 r285615  
    581581    computeOverflow(oldClientAfterEdge);
    582582
    583     fitBorderToLinesIfNeeded();
    584 
    585583    auto* state = view().frameView().layoutContext().layoutState();
    586584    if (state && state->pageLogicalHeight())
    … …  
    30473045}
    30483046
    3049 void RenderBlockFlow::adjustForBorderFit(LayoutUnit x, LayoutUnit& left, LayoutUnit& right) const
    3050 {
    3051     if (style().visibility() != Visibility::Visible)
    3052         return;
    3053 
    3054     // We don't deal with relative positioning.  Our assumption is that you shrink to fit the lines without accounting
    3055     // for either overflow or translations via relative positioning.
    3056     if (childrenInline()) {
    3057         for (auto line = InlineIterator::firstLineFor(*this); line; line.traverseNext()) {
    3058             left = std::min(left, x + LayoutUnit(line->contentLogicalLeft()));
    3059             right = std::max(right, x + LayoutUnit(ceilf(line->contentLogicalRight())));
    3060         }
    3061     } else {
    3062         for (RenderBox* obj = firstChildBox(); obj; obj = obj->nextSiblingBox()) {
    3063             if (!obj->isFloatingOrOutOfFlowPositioned()) {
    3064                 if (is<RenderBlockFlow>(*obj) && !obj->hasNonVisibleOverflow())
    3065                     downcast<RenderBlockFlow>(*obj).adjustForBorderFit(x + obj->x(), left, right);
    3066                 else if (obj->style().visibility() == Visibility::Visible) {
    3067                     // We are a replaced element or some kind of non-block-flow object.
    3068                     left = std::min(left, x + obj->x());
    3069                     right = std::max(right, x + obj->x() + obj->width());
    3070                 }
    3071             }
    3072         }
    3073     }
    3074 
    3075     if (m_floatingObjects) {
    3076         const FloatingObjectSet& floatingObjectSet = m_floatingObjects->set();
    3077         auto end = floatingObjectSet.end();
    3078         for (auto it = floatingObjectSet.begin(); it != end; ++it) {
    3079             const auto& floatingObject = *it->get();
    3080             if (floatingObject.paintsFloat()) {
    3081                 LayoutUnit floatLeft = floatingObject.translationOffsetToAncestor().width();
    3082                 LayoutUnit floatRight = floatLeft + floatingObject.renderer().width();
    3083                 left = std::min(left, floatLeft);
    3084                 right = std::max(right, floatRight);
    3085             }
    3086         }
    3087     }
    3088 }
    3089 
    3090 void RenderBlockFlow::fitBorderToLinesIfNeeded()
    3091 {
    3092     if (style().borderFit() == BorderFit::Border || hasOverridingLogicalWidth())
    3093         return;
    3094 
    3095     // Walk any normal flow lines to snugly fit.
    3096     LayoutUnit left = LayoutUnit::max();
    3097     LayoutUnit right = LayoutUnit::min();
    3098     LayoutUnit oldWidth = contentWidth();
    3099     adjustForBorderFit(0, left, right);
    3100    
    3101     // Clamp to our existing edges. We can never grow. We only shrink.
    3102     LayoutUnit leftEdge = borderLeft() + paddingLeft();
    3103     LayoutUnit rightEdge = leftEdge + oldWidth;
    3104     left = std::min(rightEdge, std::max(leftEdge, left));
    3105     right = std::max(leftEdge, std::min(rightEdge, right));
    3106    
    3107     LayoutUnit newContentWidth = right - left;
    3108     if (newContentWidth == oldWidth)
    3109         return;
    3110 
    3111     setOverridingLogicalWidth(newContentWidth + borderAndPaddingLogicalWidth());
    3112     layoutBlock(false);
    3113     clearOverridingLogicalWidth();
    3114 }
    3115 
    31163047void RenderBlockFlow::markLinesDirtyInBlockRange(LayoutUnit logicalTop, LayoutUnit logicalBottom, LegacyRootInlineBox* highest)
    31173048{

  • trunk/Source/WebCore/rendering/RenderBlockFlow.h

    r285162 r285615  
    524524
    525525    void addOverflowFromInlineChildren() override;
    526    
    527     void fitBorderToLinesIfNeeded(); // Shrink the box in which the border paints if border-fit is set.
    528     void adjustForBorderFit(LayoutUnit x, LayoutUnit& left, LayoutUnit& right) const;
    529526
    530527    void markLinesDirtyInBlockRange(LayoutUnit logicalTop, LayoutUnit logicalBottom, LegacyRootInlineBox* highest = 0);

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

    r285583 r285615  
    26112611    // FIXME: Account for block-flow in flexible boxes.
    26122612    // https://bugs.webkit.org/show_bug.cgi?id=46418
    2613     if (hasOverridingLogicalWidth() && (isRubyRun() || style().borderFit() == BorderFit::Lines || (parent()->isFlexibleBoxIncludingDeprecated()))) {
     2613    if (hasOverridingLogicalWidth() && (isRubyRun() || (parent()->isFlexibleBoxIncludingDeprecated()))) {
    26142614        computedValues.m_extent = overridingLogicalWidth();
    26152615        return;

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

    r285583 r285615  
    12361236
    12371237    bool fullRepaint = selfNeedsLayout();
    1238     // Presumably a background or a border exists if border-fit:lines was specified.
    1239     if (!fullRepaint && style().borderFit() == BorderFit::Lines)
    1240         fullRepaint = true;
    12411238    if (!fullRepaint) {
    12421239        // This ASSERT fails due to animations. See https://bugs.webkit.org/show_bug.cgi?id=37048

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

    r284437 r285615  
    10431043{
    10441044    if (first.userDrag != second.userDrag
    1045         || first.borderFit != second.borderFit
    10461045        || first.objectFit != second.objectFit
    10471046        || first.objectPosition != second.objectPosition)

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

    r285583 r285615  
    627627    const AtomString& computedLocale() const { return fontDescription().computedLocale(); }
    628628    const AtomString& specifiedLocale() const { return fontDescription().specifiedLocale(); }
    629     BorderFit borderFit() const { return static_cast<BorderFit>(m_rareNonInheritedData->borderFit); }
    630629    Resize resize() const { return static_cast<Resize>(m_rareNonInheritedData->resize); }
    631630    ColumnAxis columnAxis() const { return static_cast<ColumnAxis>(m_rareNonInheritedData->multiCol->axis); }
    … …  
    12221221    void setHyphenationLimitLines(short limit) { SET_VAR(m_rareInheritedData, hyphenationLimitLines, limit); }
    12231222    void setHyphenationString(const AtomString& h) { SET_VAR(m_rareInheritedData, hyphenationString, h); }
    1224     void setBorderFit(BorderFit b) { SET_VAR(m_rareNonInheritedData, borderFit, static_cast<unsigned>(b)); }
    12251223    void setResize(Resize r) { SET_VAR(m_rareNonInheritedData, resize, static_cast<unsigned>(r)); }
    12261224    void setColumnAxis(ColumnAxis axis) { SET_NESTED_VAR(m_rareNonInheritedData, multiCol, axis, static_cast<unsigned>(axis)); }
    … …  
    16671665    static short initialHyphenationLimitLines() { return -1; }
    16681666    static const AtomString& initialHyphenationString() { return nullAtom(); }
    1669     static BorderFit initialBorderFit() { return BorderFit::Border; }
    16701667    static Resize initialResize() { return Resize::None; }
    16711668    static ControlPart initialAppearance() { return NoControlPart; }

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

    r282723 r285615  
    124124    case BorderCollapse::Separate: ts << "separate"; break;
    125125    case BorderCollapse::Collapse: ts << "collapse"; break;
    126     }
    127     return ts;
    128 }
    129 
    130 TextStream& operator<<(TextStream& ts, BorderFit borderFit)
    131 {
    132     switch (borderFit) {
    133     case BorderFit::Border: ts << "border"; break;
    134     case BorderFit::Lines: ts << "lines"; break;
    135126    }
    136127    return ts;

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

    r284642 r285615  
    691691};
    692692
    693 enum class BorderFit : uint8_t {
    694     Border,
    695     Lines
    696 };
    697 
    698693enum class AnimationFillMode : uint8_t {
    699694    None,
    … …  
    12591254WTF::TextStream& operator<<(WTF::TextStream&, BackfaceVisibility);
    12601255WTF::TextStream& operator<<(WTF::TextStream&, BorderCollapse);
    1261 WTF::TextStream& operator<<(WTF::TextStream&, BorderFit);
    12621256WTF::TextStream& operator<<(WTF::TextStream&, BorderStyle);
    12631257WTF::TextStream& operator<<(WTF::TextStream&, BoxAlignment);

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

    r285343 r285615  
    9595    , appearance(static_cast<unsigned>(RenderStyle::initialAppearance()))
    9696    , effectiveAppearance(static_cast<unsigned>(RenderStyle::initialAppearance()))
    97     , borderFit(static_cast<unsigned>(RenderStyle::initialBorderFit()))
    9897    , textCombine(static_cast<unsigned>(RenderStyle::initialTextCombine()))
    9998    , textDecorationStyle(static_cast<unsigned>(RenderStyle::initialTextDecorationStyle()))

  • trunk/Source/WebInspectorUI/ChangeLog

    r285605 r285615  
     12021-11-10  Tim Nguyen  <ntim@apple.com>
     2
     3        Remove non-standard -webkit-border-fit CSS property
     4        https://bugs.webkit.org/show_bug.cgi?id=229564
     5
     6        Reviewed by Simon Fraser.
     7
     8        * UserInterface/Models/CSSKeywordCompletions.js:
     9
    1102021-11-10  Alexey Proskuryakov  <ap@apple.com>
    211

  • trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js

    r283899 r285615  
    10071007        "medium", "thick", "thin", "calc()",
    10081008    ],
    1009     "-webkit-border-fit": [
    1010         "border", "lines",
    1011     ],
    10121009    "-webkit-border-start-width": [
    10131010        "medium", "thick", "thin", "calc()",

  • trunk/Tools/ChangeLog

    r285608 r285615  
     12021-11-10  Tim Nguyen  <ntim@apple.com>
     2
     3        Remove non-standard -webkit-border-fit CSS property
     4        https://bugs.webkit.org/show_bug.cgi?id=229564
     5
     6        Reviewed by Simon Fraser.
     7
     8        * LayoutReloaded/misc/LFC-passing-tests.txt:
     9
    1102021-11-10  Myles C. Maxfield  <mmaxfield@apple.com>
    211

  • trunk/Tools/LayoutReloaded/misc/LFC-passing-tests.txt

    r253147 r285615  
    373373fast/borders/block-mask-overlay-image.html
    374374fast/borders/border-color-inherit.html
    375 fast/borders/border-fit.html
    376375fast/borders/border-image-01.html
    377376fast/borders/border-image-border-radius.html
Note: See TracChangeset for help on using the changeset viewer.