Attachment 427650 Details for Bug 222711 – Patch

[patch] Patch

bug-222711-20210504131137.patch (text/plain), 4.52 KB, created by Sergio Villar Senin on 2021-05-04 04:11:39 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sergio Villar Senin

Created: 2021-05-04 04:11:39 PDT

Size: 4.52 KB

patch

obsolete

>Subversion Revision: 276952
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index e31ea9e243749463d40f18a706c54b8ec4ca7a38..203ab09d2156dd49d7d82616d4a0fbe9d7eedfdd 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,21 @@
>+2021-05-04  Sergio Villar Senin  <svillar@igalia.com>
>+
>+        ASSERTION FAILED: contentSize >= 0 in WebCore::RenderFlexibleBox::adjustChildSizeForMinAndMax
>+        https://bugs.webkit.org/show_bug.cgi?id=222711
>+        <rdar://problem/75022692>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Flexbox code was computing negative content sizes for FrameSet children because RenderFrameSet lacked
>+        a implementation of computePreferredLogicalWidths(). Added basic preferred width computation
>+        to RenderBox so that FrameSet and any other potential new RenderBox child could benefit from it.
>+
>+        * rendering/RenderBox.cpp:
>+        (WebCore::RenderBox::computePreferredLogicalWidths): Added a basic implementation that calls
>+        computePreferredLogicalWidths(minWidth,maxWidth,borderAndPadding) and clears the flag.
>+        * rendering/RenderBox.h:
>+        (WebCore::RenderBox::computePreferredLogicalWidths): Deleted default implementation.
>+
> 2021-05-04  Youenn Fablet  <youenn@apple.com>
> 
>         Use OptionSet for MediaProducer::MediaStateFlags
>diff --git a/Source/WebCore/rendering/RenderBox.cpp b/Source/WebCore/rendering/RenderBox.cpp
>index d74806ac9fe639b7e36e9a2846233fb01f70a1b3..142cfb4e480ca077eb7f445aba09e04afa3eaa77 100644
>--- a/Source/WebCore/rendering/RenderBox.cpp
>+++ b/Source/WebCore/rendering/RenderBox.cpp
>@@ -3223,6 +3223,14 @@ static bool allowMinMaxPercentagesInAutoHeightBlocksQuirk()
> #endif
> }
> 
>+void RenderBox::computePreferredLogicalWidths()
>+{
>+    ASSERT(preferredLogicalWidthsDirty());
>+
>+    computePreferredLogicalWidths(style().logicalMinWidth(), style().logicalMaxWidth(), borderAndPaddingLogicalWidth());
>+    setPreferredLogicalWidthsDirty(false);
>+}
>+
> void RenderBox::computePreferredLogicalWidths(const Length& minWidth, const Length& maxWidth, LayoutUnit borderAndPadding)
> {
>     if (shouldComputeLogicalHeightFromAspectRatio()) {
>diff --git a/Source/WebCore/rendering/RenderBox.h b/Source/WebCore/rendering/RenderBox.h
>index 5cca6f5bfd20068687f93371c8a97e5d49f577b6..46d8f4cf259757e0a244ea247887bd06f5e59529 100644
>--- a/Source/WebCore/rendering/RenderBox.h
>+++ b/Source/WebCore/rendering/RenderBox.h
>@@ -760,7 +760,7 @@ private:
>     // This function calculates the minimum and maximum preferred widths for an object.
>     // These values are used in shrink-to-fit layout systems.
>     // These include tables, positioned objects, floats and flexible boxes.
>-    virtual void computePreferredLogicalWidths() { setPreferredLogicalWidthsDirty(false); }
>+    virtual void computePreferredLogicalWidths();
> 
>     LayoutRect frameRectForStickyPositioning() const final { return frameRect(); }
> 
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 9ec367407b23adc71dd7b3d1396fa5a24ae39ea6..dfe63506cbf907b186246188b8b467b7252d66e6 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,13 @@
>+2021-05-04  Sergio Villar Senin  <svillar@igalia.com>
>+
>+        ASSERTION FAILED: contentSize >= 0 in WebCore::RenderFlexibleBox::adjustChildSizeForMinAndMax
>+        https://bugs.webkit.org/show_bug.cgi?id=222711
>+        <rdar://problem/75022692>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * TestExpectations: Unskipped a test that is passing now.
>+
> 2021-05-03  Simon Fraser  <simon.fraser@apple.com>
> 
>         REGRESSION (r274461): [macOS wk1] fast/repaint/canvas-object-fit.html is flakey text failing
>diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
>index 84cf0e5d7ffed647d44f77078fa2c3f6610646bb..c69bb7e5b8fe0b2fe084dac16dcde4904d7867a1 100644
>--- a/LayoutTests/TestExpectations
>+++ b/LayoutTests/TestExpectations
>@@ -3947,9 +3947,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 ]

Actions: View | Formatted Diff | Diff

Attachments on bug 222711: 423322 | 427650