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

Changeset 285857 in webkit


Ignore:
Timestamp:
Nov 16, 2021, 3:41:05 AM (5 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, reverting r280078, r280290 and r282008.
​https://bugs.webkit.org/show_bug.cgi?id=233184

Caused a crash in grid

Reverted changesets:

"Images as grid items should use the overridingLogicalWidth
when defined to compute the logical Height"
​https://bugs.webkit.org/show_bug.cgi?id=228022
​https://commits.webkit.org/r280078

"[css-grid] svg image as grid items should use the overriding
logical width/height when defined to compute the logical
height/width"
​https://bugs.webkit.org/show_bug.cgi?id=228105
​https://commits.webkit.org/r280290

"REGRESSION(r280078): broke fast/images/exif-orientation-
composited.html on windows"
​https://bugs.webkit.org/show_bug.cgi?id=228325
​https://commits.webkit.org/r282008

Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r285855 r285857  
     12021-11-16  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, reverting r280078, r280290 and r282008.
     4        https://bugs.webkit.org/show_bug.cgi?id=233184
     5
     6        Caused a crash in grid
     7
     8        Reverted changesets:
     9
     10        "Images as grid items should use the overridingLogicalWidth
     11        when defined to compute the logical Height"
     12        https://bugs.webkit.org/show_bug.cgi?id=228022
     13        https://commits.webkit.org/r280078
     14
     15        "[css-grid] svg image as grid items should use the overriding
     16        logical width/height when defined to compute the logical
     17        height/width"
     18        https://bugs.webkit.org/show_bug.cgi?id=228105
     19        https://commits.webkit.org/r280290
     20
     21        "REGRESSION(r280078): broke fast/images/exif-orientation-
     22        composited.html on windows"
     23        https://bugs.webkit.org/show_bug.cgi?id=228325
     24        https://commits.webkit.org/r282008
     25
    1262021-11-16  Arcady Goldmints-Orlov  <agoldmints@igalia.com>
    227

  • trunk/LayoutTests/TestExpectations

    r285854 r285857  
    13891389webkit.org/b/216146 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-baseline-align-001.html [ ImageOnlyFailure ]
    13901390webkit.org/b/216146 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-baseline-justify-001.html [ ImageOnlyFailure ]
     1391imported/w3c/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-002.html [ ImageOnlyFailure ]
     1392imported/w3c/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-007.html [ ImageOnlyFailure ]
     1393imported/w3c/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-008.html [ ImageOnlyFailure ]
    13911394
    13921395imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-dynamic-001.html [ ImageOnlyFailure ]
    … …  
    43174320webkit.org/b/209460 imported/w3c/web-platform-tests/css/css-grid/abspos/descendant-static-position-003.html [ ImageOnlyFailure ]
    43184321webkit.org/b/212201 imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-limits-001.html [ Skip ]
     4322webkit.org/b/227900 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-1.html [ ImageOnlyFailure ]
     4323webkit.org/b/227900 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-2.html [ ImageOnlyFailure ]
     4324webkit.org/b/227900 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-3.html [ ImageOnlyFailure ]
     4325webkit.org/b/227900 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-4.html [ ImageOnlyFailure ]
    43194326webkit.org/b/212246 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-baseline-align-cycles-001.html [ ImageOnlyFailure ]
    43204327webkit.org/b/231021 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-inline-baseline.html [ ImageOnlyFailure ]

  • trunk/LayoutTests/imported/w3c/ChangeLog

    r285852 r285857  
     12021-11-16  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, reverting r280078, r280290 and r282008.
     4        https://bugs.webkit.org/show_bug.cgi?id=233184
     5
     6        Caused a crash in grid
     7
     8        Reverted changesets:
     9
     10        "Images as grid items should use the overridingLogicalWidth
     11        when defined to compute the logical Height"
     12        https://bugs.webkit.org/show_bug.cgi?id=228022
     13        https://commits.webkit.org/r280078
     14
     15        "[css-grid] svg image as grid items should use the overriding
     16        logical width/height when defined to compute the logical
     17        height/width"
     18        https://bugs.webkit.org/show_bug.cgi?id=228105
     19        https://commits.webkit.org/r280290
     20
     21        "REGRESSION(r280078): broke fast/images/exif-orientation-
     22        composited.html on windows"
     23        https://bugs.webkit.org/show_bug.cgi?id=228325
     24        https://commits.webkit.org/r282008
     25
    1262021-11-15  Tim Nguyen  <ntim@apple.com>
    227

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-029-expected.txt

    r280078 r285857  
    11
    22
    3 PASS .before 1
     3FAIL .before 1 assert_equals:
     4<img id="item" src="support/100x100-green.png" class=" before" data-expected-width="200" data-expected-height="200">
     5height expected 200 but got 100
    46PASS .after 2
    57

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-030-expected.txt

    r280078 r285857  
    22
    33PASS .before 1
    4 PASS .after 2
     4FAIL .after 2 assert_equals:
     5<img id="item" src="support/100x100-green.png" class=" before after" data-expected-width="200" data-expected-height="200">
     6height expected 200 but got 100
    57

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-031-expected.txt

    r280078 r285857  
    11
    22
    3 PASS .before 1
     3FAIL .before 1 assert_equals:
     4<img id="item" src="support/100x100-green.png" class=" before" data-expected-width="200" data-expected-height="200">
     5height expected 200 but got 100
    46PASS .after 2
    57

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-035-expected.txt

    r280078 r285857  
    22
    33PASS .before 1
    4 PASS .after 2
     4FAIL .after 2 assert_equals:
     5<img id="item" src="support/100x100-green.png" class=" before after" data-expected-width="80" data-expected-height="80">
     6height expected 80 but got 100
    57

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-036-expected.txt

    r280078 r285857  
    11
    22
    3 PASS .before 1
     3FAIL .before 1 assert_equals:
     4<img id="item" src="support/100x100-green.png" class=" before" data-expected-width="80" data-expected-height="80">
     5height expected 80 but got 100
    46PASS .after 2
    57

  • trunk/LayoutTests/platform/win/TestExpectations

    r285610 r285857  
    38223822webkit.org/b/177216 fast/images/animated-image-mp4.html [ Skip ]
    38233823
     3824webkit.org/b/228325 fast/images/exif-orientation-composited.html [ Pass ImageOnlyFailure ]
     3825
    38243826webkit.org/b/177234 http/wpt/resource-timing/rt-cors.html [ Skip ]
    38253827webkit.org/b/177234 http/wpt/resource-timing/rt-cors.worker.html [ Skip ]

  • trunk/Source/WebCore/ChangeLog

    r285854 r285857  
     12021-11-16  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, reverting r280078, r280290 and r282008.
     4        https://bugs.webkit.org/show_bug.cgi?id=233184
     5
     6        Caused a crash in grid
     7
     8        Reverted changesets:
     9
     10        "Images as grid items should use the overridingLogicalWidth
     11        when defined to compute the logical Height"
     12        https://bugs.webkit.org/show_bug.cgi?id=228022
     13        https://commits.webkit.org/r280078
     14
     15        "[css-grid] svg image as grid items should use the overriding
     16        logical width/height when defined to compute the logical
     17        height/width"
     18        https://bugs.webkit.org/show_bug.cgi?id=228105
     19        https://commits.webkit.org/r280290
     20
     21        "REGRESSION(r280078): broke fast/images/exif-orientation-
     22        composited.html on windows"
     23        https://bugs.webkit.org/show_bug.cgi?id=228325
     24        https://commits.webkit.org/r282008
     25
    1262021-11-16  Cathie Chen  <cathiechen@igalia.com>
    227

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

    r285497 r285857  
    11801180{
    11811181    ASSERT(child.overridingContainingBlockContentLogicalHeight());
    1182     ASSERT(child.overridingContainingBlockContentLogicalWidth());
    1183 
    1184     // We clear height and width override values because we will decide now whether it's allowed or
     1182
     1183    // We clear height override values because we will decide now whether it's allowed or
    11851184    // not, evaluating the conditions which might have changed since the old values were set.
    11861185    child.clearOverridingLogicalHeight();
    1187     child.clearOverridingLogicalWidth();
    11881186
    11891187    GridTrackSizingDirection childBlockDirection = GridLayoutFunctions::flowAwareDirectionForChild(*this, child, ForRows);
    1190     GridTrackSizingDirection childInlineDirection = GridLayoutFunctions::flowAwareDirectionForChild(*this, child, ForColumns);
    11911188    bool blockFlowIsColumnAxis = childBlockDirection == ForRows;
    11921189    bool allowedToStretchChildBlockSize = blockFlowIsColumnAxis ? allowedToStretchChildAlongColumnAxis(child) : allowedToStretchChildAlongRowAxis(child);
    … …  
    12041201            child.setNeedsLayout(MarkOnlyThis);
    12051202        }
    1206     } else if (!allowedToStretchChildBlockSize && allowedToStretchChildAlongRowAxis(child)) {
    1207         LayoutUnit stretchedLogicalWidth = availableAlignmentSpaceForChildBeforeStretching(GridLayoutFunctions::overridingContainingBlockContentSizeForChild(child, childInlineDirection).value(), child);
    1208         LayoutUnit desiredLogicalWidth = constrainLogicalWidthInFragmentByMinMax(stretchedLogicalWidth, contentWidth(), *this, nullptr);
    1209         child.setOverridingLogicalWidth(desiredLogicalWidth);
    1210         if (desiredLogicalWidth != child.logicalWidth())
    1211             child.setNeedsLayout(MarkOnlyThis);
    1212     }
     1203    }
    12131204}
    12141205

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

    r284095 r285857  
    554554        // grid item has an intrinsic size. It is possible (indeed, common) for an SVG graphic to have an intrinsic aspect ratio but not to have an intrinsic
    555555        // width or height. There are also elements with intrinsic sizes but without intrinsic ratio (like an iframe).
    556         if (intrinsicRatio && (isFlexItem() || isGridItem()) && hasOverridingLogicalHeight() && ((hasIntrinsicWidth && hasIntrinsicHeight) || (contentRenderer && contentRenderer->isSVGRoot() && (hasIntrinsicWidth || hasIntrinsicHeight))))
     556        if (intrinsicRatio && (isFlexItem() || isGridItem()) && hasOverridingLogicalHeight() && hasIntrinsicWidth && hasIntrinsicHeight)
    557557            return computeReplacedLogicalWidthRespectingMinMaxWidth(roundToInt(round(overridingContentLogicalHeight() * intrinsicRatio)), shouldComputePreferred);
    558558
    … …  
    624624
    625625    // See computeReplacedLogicalHeight() for a similar check for heights.
    626     if (intrinsicRatio && (isFlexItem() || isGridItem()) && hasOverridingLogicalWidth() && ((hasIntrinsicWidth && hasIntrinsicHeight) || (contentRenderer && contentRenderer->isSVGRoot() && (hasIntrinsicWidth || hasIntrinsicHeight))))
     626    if (intrinsicRatio && isFlexItem() && hasOverridingLogicalWidth() && hasIntrinsicHeight && hasIntrinsicWidth)
    627627        return computeReplacedLogicalHeightRespectingMinMaxHeight(roundToInt(round(overridingContentLogicalWidth() / intrinsicRatio)));
    628628
Note: See TracChangeset for help on using the changeset viewer.