Attachment 423322 Details for Bug 222711 – Patch

[patch] Patch

bug-222711-20210316132631.patch (text/plain), 3.97 KB, created by Sergio Villar Senin on 2021-03-16 05:26:33 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sergio Villar Senin

Created: 2021-03-16 05:26:33 PDT

Size: 3.97 KB

patch

obsolete

>Subversion Revision: 274472
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 8a3ac7c8dedd644349a91de739a58410cf3fe0ac..1e267c850f50fb546125091b7c6bf34085fe5f4c 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2021-03-16  Sergio Villar Senin  <svillar@igalia.com>
>+
>+        ASSERTION FAILED: contentSize >= 0 in WefbCore::RenderFlexibleBox::adjustChildSizeForMinAndMax
>+        https://bugs.webkit.org/show_bug.cgi?id=222711
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        FrameSet did not have code to compute the preferred widths. Added basic preferred width computation
>+        so that flexbox does not compute negative content sizes for FrameSet children.
>+
>+        * rendering/RenderFrameSet.cpp:
>+        (WebCore::RenderFrameSet::computePreferredLogicalWidths): New method.
>+        * rendering/RenderFrameSet.h:
>+
> 2021-03-16  Frederic Wang  <fwang@igalia.com>
> 
>         Crash in makeBoundaryPoint via ReplaceSelectionCommand::insertedContentRange
>diff --git a/Source/WebCore/rendering/RenderFrameSet.cpp b/Source/WebCore/rendering/RenderFrameSet.cpp
>index 0b48d936b2354150c9c7154757bd5948383d3cee..1bebd38d37cf2030f97f6325c13071c530dbf8f3 100644
>--- a/Source/WebCore/rendering/RenderFrameSet.cpp
>+++ b/Source/WebCore/rendering/RenderFrameSet.cpp
>@@ -429,6 +429,14 @@ FrameEdgeInfo RenderFrameSet::edgeInfo() const
>     return result;
> }
> 
>+void RenderFrameSet::computePreferredLogicalWidths()
>+{
>+    ASSERT(preferredLogicalWidthsDirty());
>+
>+    RenderBox::computePreferredLogicalWidths(style().logicalMinWidth(), style().logicalMaxWidth(), borderAndPaddingLogicalWidth());
>+    setPreferredLogicalWidthsDirty(false);
>+}
>+
> void RenderFrameSet::layout()
> {
>     StackStats::LayoutCheckPoint layoutCheckPoint;
>diff --git a/Source/WebCore/rendering/RenderFrameSet.h b/Source/WebCore/rendering/RenderFrameSet.h
>index 0f8a090971282cf112ab50f1886d0c1071c95cc2..4cca1d757f128fcc8c669d7b20fdcfb1730e0fde 100644
>--- a/Source/WebCore/rendering/RenderFrameSet.h
>+++ b/Source/WebCore/rendering/RenderFrameSet.h
>@@ -94,6 +94,8 @@ private:
>     const char* renderName() const override { return "RenderFrameSet"; }
>     bool isFrameSet() const override { return true; }
> 
>+    void computePreferredLogicalWidths() override;
>+
>     void layout() override;
>     void paint(PaintInfo&, const LayoutPoint&) override;
>     bool canHaveChildren() const override { return true; }
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 7117f2b867ddd0f50b6c96967eae9f4f2c4a9c32..2b3373003a767beefed0196f8d1f0e80d994bb77 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,12 @@
>+2021-03-16  Sergio Villar Senin  <svillar@igalia.com>
>+
>+        ASSERTION FAILED: contentSize >= 0 in WefbCore::RenderFlexibleBox::adjustChildSizeForMinAndMax
>+        https://bugs.webkit.org/show_bug.cgi?id=222711
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * TestExpectations: Unskipped a test that is passing now.
>+
> 2021-03-16  Frederic Wang  <fwang@igalia.com>
> 
>         Crash in makeBoundaryPoint via ReplaceSelectionCommand::insertedContentRange
>diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
>index 1f3b9ca59a51195db933a2907f663aa43e9d51e1..5572656fc22c173e8ae706f6c32e09bf7b18fe75 100644
>--- a/LayoutTests/TestExpectations
>+++ b/LayoutTests/TestExpectations
>@@ -4062,9 +4062,6 @@ webkit.org/b/221482 imported/w3c/web-platform-tests/css/css-flexbox/flexbox-coll
> # Painting order in flexbox
> webkit.org/b/221482 imported/w3c/web-platform-tests/css/css-flexbox/flexbox-paint-ordering-002.xhtml [ ImageOnlyFailure ]
> 
>-# Test ASSERTing in Debug.
>-webkit.org/b/222711 [ Debug ] imported/w3c/web-platform-tests/css/css-flexbox/frameset-crash.html [ Skip ]
>-
> # Newly imported Canvas WPT tests that are failing.
> imported/w3c/web-platform-tests/html/canvas/element/building-paths/canvas_complexshapes_arcto_001.htm [ ImageOnlyFailure Pass ]
> imported/w3c/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.broken.html [ Failure Pass ]

Flags:

simon.fraser: review+
zalan: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 222711: 423322 | 427650