Changeset 207290 in webkit


Ignore:
Timestamp:
Oct 13, 2016 10:02:53 AM (8 years ago)
Author:
svillar@igalia.com
Message:

[css-grid] Use min-size instead of min-content contribution for intrinsic maximums resolution
​https://bugs.webkit.org/show_bug.cgi?id=163283

Reviewed by Manuel Rego Casasnovas.

Source/WebCore:

This was recently modified in the specs
​https://hg.csswg.org/drafts/diff/575fb847e29d/css-grid/Overview.bs. Specifically this is
addressing the last one. It used to be "min-content contribution" but now it says "min-size
contribution".

  • rendering/RenderGrid.cpp:

(WebCore::RenderGrid::currentItemSizeForTrackSizeComputationPhase):

LayoutTests:

Uncommented a bunch of failing test cases that are working fine now.

  • fast/css-grid-layout/grid-intrinsic-maximums-expected.html:
  • fast/css-grid-layout/grid-intrinsic-maximums.html:
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r207288 r207290  
     12016-10-13  Sergio Villar Senin  <svillar@igalia.com>
     2
     3        [css-grid] Use min-size instead of min-content contribution for intrinsic maximums resolution
     4        https://bugs.webkit.org/show_bug.cgi?id=163283
     5
     6        Reviewed by Manuel Rego Casasnovas.
     7
     8        Uncommented a bunch of failing test cases that are working fine now.
     9
     10        * fast/css-grid-layout/grid-intrinsic-maximums-expected.html:
     11        * fast/css-grid-layout/grid-intrinsic-maximums.html:
     12
    1132016-10-11  Sergio Villar Senin  <svillar@igalia.com>
    214

  • trunk/LayoutTests/fast/css-grid-layout/grid-intrinsic-maximums-expected.html

    r207288 r207290  
    4141<div class="float">
    4242
    43 <!-- Fails due to http://wkb.ug/163283 -->
    44 <!--
    4543<div class="grid" style="grid-template: 20px / 10px 5px;">
    4644    <div class="item" style="min-width: 15px;">XXXX XXXX</div>
    … …  
    4846    <div class="abs col2"></div>
    4947</div>
    50 -->
    5148
    5249<div class="grid" style="grid-template: 20px / 50px 5px;">
    … …  
    5653</div>
    5754
    58 <!-- Fails due to http://wkb.ug/163283 -->
    59 <!--
    6055<div class="grid" style="grid-template: 20px / 85px 5px;">
    6156    <div class="item min-width-max-content">XXXX XXXX</div>
    … …  
    6358    <div class="abs col2"></div>
    6459</div>
    65 -->
    6660
    6761<div class="grid" style="grid-template: 20px / 5px 85px;">
    … …  
    8781<div class="float">
    8882
    89 <!-- Fails due to http://wkb.ug/163283 -->
    90 <!--
    9183<div class="grid" style="grid-template: 20px / repeat(2, 5px) 80px;">
    9284    <div class="item" style="min-width: 15px;">XXXX XXXX</div>
    … …  
    9587    <div class="abs col3"></div>
    9688</div>
    97 -->
    9889
    9990<div class="grid" style="grid-template: 20px / 25px 5px 60px;">
    … …  
    10495</div>
    10596
    106 <!-- Fails due to http://wkb.ug/163283 -->
    107 <!--
    10897<div class="grid" style="grid-template: 20px / calc(85px / 2) 5px calc(85px / 2);">
    10998    <div class="item min-width-max-content">XXXX XXXX</div>
    … …  
    112101    <div class="abs col3"></div>
    113102</div>
    114 -->
    115103
    116 <!-- Fails due to http://wkb.ug/163283 -->
    117 <!--
    118104<div class="grid" style="grid-template: 20px / 90px repeat(2, 5px);">
    119105    <div class="item" style="min-width: 15px;">XXXX XXXX</div>
    … …  
    122108    <div class="abs col3"></div>
    123109</div>
    124 -->
    125110
    126111<div class="grid" style="grid-template: 20px / 70px 5px 25px;">
    … …  
    131116</div>
    132117
    133 <!-- Fails due to http://wkb.ug/163283 -->
    134 <!--
    135118<div class="grid" style="grid-template: 20px / calc(105px/2) 5px calc(85px/2);">
    136119    <div class="item min-width-max-content">XXXX XXXX</div>
    … …  
    139122    <div class="abs col3"></div>
    140123</div>
    141 -->
    142124
    143125</div>

  • trunk/LayoutTests/fast/css-grid-layout/grid-intrinsic-maximums.html

    r207288 r207290  
    4848<div class="float">
    4949
    50 <!-- Fails due to http://wkb.ug/163283 -->
    51 <!--
    5250<div class="grid gridMinContent">
    5351    <div class="item" style="min-width: 15px;">XXXX XXXX</div>
    … …  
    5553    <div class="abs col2"></div>
    5654</div>
    57 -->
    5855
    5956<div class="grid gridMinContent">
    … …  
    6360</div>
    6461
    65 <!-- Fails due to http://wkb.ug/163283 -->
    66 <!--
    6762<div class="grid gridMinContent">
    6863    <div class="item min-width-max-content">XXXX XXXX</div>
    … …  
    7065    <div class="abs col2"></div>
    7166</div>
    72 -->
    7367
    7468<div class="grid gridMaxContent">
    … …  
    9488<div class="float">
    9589
    96 <!-- Fails due to http://wkb.ug/163283 -->
    97 <!--
    9890<div class="grid gridMinMaxContent">
    9991    <div class="item" style="min-width: 15px;">XXXX XXXX</div>
    … …  
    10294    <div class="abs col3"></div>
    10395</div>
    104 -->
    10596
    10697<div class="grid gridMinMaxContent">
    … …  
    111102</div>
    112103
    113 <!-- Fails due to http://wkb.ug/163283 -->
    114 <!--
    115104<div class="grid gridMinMaxContent">
    116105    <div class="item min-width-max-content">XXXX XXXX</div>
    … …  
    120109</div>
    121110
    122 <!-- Fails due to http://wkb.ug/163283 -->
    123 <!--
    124111<div class="grid gridAutoMinContent">
    125112    <div class="item" style="min-width: 15px;">XXXX XXXX</div>
    … …  
    128115    <div class="abs col3"></div>
    129116</div>
    130 -->
    131117
    132118<div class="grid gridAutoMinContent">
    … …  
    137123</div>
    138124
    139 <!-- Fails due to http://wkb.ug/163283 -->
    140 <!--
    141125<div class="grid gridAutoMinContent">
    142126    <div class="item min-width-max-content">XXXX XXXX</div>
    … …  
    145129    <div class="abs col3"></div>
    146130</div>
    147 -->
    148131
    149132</div>

  • trunk/Source/WebCore/ChangeLog

    r207288 r207290  
     12016-10-13  Sergio Villar Senin  <svillar@igalia.com>
     2
     3        [css-grid] Use min-size instead of min-content contribution for intrinsic maximums resolution
     4        https://bugs.webkit.org/show_bug.cgi?id=163283
     5
     6        Reviewed by Manuel Rego Casasnovas.
     7
     8        This was recently modified in the specs
     9        https://hg.csswg.org/drafts/diff/575fb847e29d/css-grid/Overview.bs. Specifically this is
     10        addressing the last one. It used to be "min-content contribution" but now it says "min-size
     11        contribution".
     12
     13        * rendering/RenderGrid.cpp:
     14        (WebCore::RenderGrid::currentItemSizeForTrackSizeComputationPhase):
     15
    1162016-10-11  Sergio Villar Senin  <svillar@igalia.com>
    217

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

    r207288 r207290  
    12921292    switch (phase) {
    12931293    case ResolveIntrinsicMinimums:
     1294    case ResolveIntrinsicMaximums:
    12941295        return minSizeForChild(gridItem, direction, sizingData);
    12951296    case ResolveContentBasedMinimums:
    1296     case ResolveIntrinsicMaximums:
    12971297        return minContentForChild(gridItem, direction, sizingData);
    12981298    case ResolveMaxContentMinimums:
Note: See TracChangeset for help on using the changeset viewer.