| Differences between
and this patch
- a/Source/WebCore/ChangeLog +14 lines
Lines 1-3 a/Source/WebCore/ChangeLog_sec1
1
2021-03-16  Sergio Villar Senin  <svillar@igalia.com>
2
3
        ASSERTION FAILED: contentSize >= 0 in WefbCore::RenderFlexibleBox::adjustChildSizeForMinAndMax
4
        https://bugs.webkit.org/show_bug.cgi?id=222711
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        FrameSet did not have code to compute the preferred widths. Added basic preferred width computation
9
        so that flexbox does not compute negative content sizes for FrameSet children.
10
11
        * rendering/RenderFrameSet.cpp:
12
        (WebCore::RenderFrameSet::computePreferredLogicalWidths): New method.
13
        * rendering/RenderFrameSet.h:
14
1
2021-03-16  Frederic Wang  <fwang@igalia.com>
15
2021-03-16  Frederic Wang  <fwang@igalia.com>
2
16
3
        Crash in makeBoundaryPoint via ReplaceSelectionCommand::insertedContentRange
17
        Crash in makeBoundaryPoint via ReplaceSelectionCommand::insertedContentRange
- a/Source/WebCore/rendering/RenderFrameSet.cpp +8 lines
Lines 429-434 FrameEdgeInfo RenderFrameSet::edgeInfo() const a/Source/WebCore/rendering/RenderFrameSet.cpp_sec1
429
    return result;
429
    return result;
430
}
430
}
431
431
432
void RenderFrameSet::computePreferredLogicalWidths()
433
{
434
    ASSERT(preferredLogicalWidthsDirty());
435
436
    RenderBox::computePreferredLogicalWidths(style().logicalMinWidth(), style().logicalMaxWidth(), borderAndPaddingLogicalWidth());
437
    setPreferredLogicalWidthsDirty(false);
438
}
439
432
void RenderFrameSet::layout()
440
void RenderFrameSet::layout()
433
{
441
{
434
    StackStats::LayoutCheckPoint layoutCheckPoint;
442
    StackStats::LayoutCheckPoint layoutCheckPoint;
- a/Source/WebCore/rendering/RenderFrameSet.h +2 lines
Lines 94-99 private: a/Source/WebCore/rendering/RenderFrameSet.h_sec1
94
    const char* renderName() const override { return "RenderFrameSet"; }
94
    const char* renderName() const override { return "RenderFrameSet"; }
95
    bool isFrameSet() const override { return true; }
95
    bool isFrameSet() const override { return true; }
96
96
97
    void computePreferredLogicalWidths() override;
98
97
    void layout() override;
99
    void layout() override;
98
    void paint(PaintInfo&, const LayoutPoint&) override;
100
    void paint(PaintInfo&, const LayoutPoint&) override;
99
    bool canHaveChildren() const override { return true; }
101
    bool canHaveChildren() const override { return true; }
- a/LayoutTests/ChangeLog +9 lines
Lines 1-3 a/LayoutTests/ChangeLog_sec1
1
2021-03-16  Sergio Villar Senin  <svillar@igalia.com>
2
3
        ASSERTION FAILED: contentSize >= 0 in WefbCore::RenderFlexibleBox::adjustChildSizeForMinAndMax
4
        https://bugs.webkit.org/show_bug.cgi?id=222711
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        * TestExpectations: Unskipped a test that is passing now.
9
1
2021-03-16  Frederic Wang  <fwang@igalia.com>
10
2021-03-16  Frederic Wang  <fwang@igalia.com>
2
11
3
        Crash in makeBoundaryPoint via ReplaceSelectionCommand::insertedContentRange
12
        Crash in makeBoundaryPoint via ReplaceSelectionCommand::insertedContentRange
- a/LayoutTests/TestExpectations -3 lines
Lines 4062-4070 webkit.org/b/221482 imported/w3c/web-platform-tests/css/css-flexbox/flexbox-coll a/LayoutTests/TestExpectations_sec1
4062
# Painting order in flexbox
4062
# Painting order in flexbox
4063
webkit.org/b/221482 imported/w3c/web-platform-tests/css/css-flexbox/flexbox-paint-ordering-002.xhtml [ ImageOnlyFailure ]
4063
webkit.org/b/221482 imported/w3c/web-platform-tests/css/css-flexbox/flexbox-paint-ordering-002.xhtml [ ImageOnlyFailure ]
4064
4064
4065
# Test ASSERTing in Debug.
4066
webkit.org/b/222711 [ Debug ] imported/w3c/web-platform-tests/css/css-flexbox/frameset-crash.html [ Skip ]
4067
4068
# Newly imported Canvas WPT tests that are failing.
4065
# Newly imported Canvas WPT tests that are failing.
4069
imported/w3c/web-platform-tests/html/canvas/element/building-paths/canvas_complexshapes_arcto_001.htm [ ImageOnlyFailure Pass ]
4066
imported/w3c/web-platform-tests/html/canvas/element/building-paths/canvas_complexshapes_arcto_001.htm [ ImageOnlyFailure Pass ]
4070
imported/w3c/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.broken.html [ Failure Pass ]
4067
imported/w3c/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.broken.html [ Failure Pass ]

Return to Bug 222711