Title: [233365] trunk
Revision
233365
Author
[email protected]
Date
2018-06-29 11:54:41 -0700 (Fri, 29 Jun 2018)

Log Message

[WPE] Three CSS Grid Layout tests crash due to valueless std::optional access
https://bugs.webkit.org/show_bug.cgi?id=186752

Reviewed by Frédéric Wang.

Source/WebCore:

This is a simple fix for the crash we're getting on WPE
in IndefiniteSizeStrategy::freeSpaceForStretchAutoTracksStep().

Covered by existent tests, just remove them from TestExpectations file.

* rendering/GridTrackSizingAlgorithm.cpp:
(WebCore::IndefiniteSizeStrategy::freeSpaceForStretchAutoTracksStep const):
Check if minSize is null before trying to access it's value.

LayoutTests:

* platform/wpe/TestExpectations: Remove tests from TestExpectations file
as they're passing now.

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (233364 => 233365)


--- trunk/LayoutTests/ChangeLog	2018-06-29 18:12:50 UTC (rev 233364)
+++ trunk/LayoutTests/ChangeLog	2018-06-29 18:54:41 UTC (rev 233365)
@@ -1,3 +1,13 @@
+2018-06-29  Manuel Rego Casasnovas  <[email protected]>
+
+        [WPE] Three CSS Grid Layout tests crash due to valueless std::optional access
+        https://bugs.webkit.org/show_bug.cgi?id=186752
+
+        Reviewed by Frédéric Wang.
+
+        * platform/wpe/TestExpectations: Remove tests from TestExpectations file
+        as they're passing now.
+
 2018-06-29  Thibault Saunier  <[email protected]>
 
         [GTK][WPE]: Add a way to setup our development environment inside flatpak

Modified: trunk/LayoutTests/platform/wpe/TestExpectations (233364 => 233365)


--- trunk/LayoutTests/platform/wpe/TestExpectations	2018-06-29 18:12:50 UTC (rev 233364)
+++ trunk/LayoutTests/platform/wpe/TestExpectations	2018-06-29 18:54:41 UTC (rev 233365)
@@ -1220,10 +1220,6 @@
 webkit.org/b/184501 imported/w3c/web-platform-tests/WebCryptoAPI/generateKey/failures.worker.html [ Failure ]
 webkit.org/b/184501 imported/w3c/web-platform-tests/WebCryptoAPI/generateKey/successes.worker.html [ Failure ]
 
-webkit.org/b/186752 fast/css-grid-layout/flex-sizing-rows-min-max-height.html [ Crash ]
-webkit.org/b/186752 fast/css-grid-layout/grid-indefinite-size-auto-repeat-crash.html [ Crash ]
-webkit.org/b/186752 fast/css-grid-layout/maximize-tracks-definite-indefinite-height.html [ Crash ]
-
 webkit.org/b/186100 css3/color-filters/color-filter-color-property-list-item.html [ ImageOnlyFailure ]
 webkit.org/b/186100 css3/color-filters/color-filter-ignore-semantic.html [ ImageOnlyFailure ]
 webkit.org/b/186100 css3/color-filters/color-filter-opacity.html [ ImageOnlyFailure ]

Modified: trunk/Source/WebCore/ChangeLog (233364 => 233365)


--- trunk/Source/WebCore/ChangeLog	2018-06-29 18:12:50 UTC (rev 233364)
+++ trunk/Source/WebCore/ChangeLog	2018-06-29 18:54:41 UTC (rev 233365)
@@ -1,3 +1,19 @@
+2018-06-29  Manuel Rego Casasnovas  <[email protected]>
+
+        [WPE] Three CSS Grid Layout tests crash due to valueless std::optional access
+        https://bugs.webkit.org/show_bug.cgi?id=186752
+
+        Reviewed by Frédéric Wang.
+
+        This is a simple fix for the crash we're getting on WPE
+        in IndefiniteSizeStrategy::freeSpaceForStretchAutoTracksStep().
+
+        Covered by existent tests, just remove them from TestExpectations file.
+
+        * rendering/GridTrackSizingAlgorithm.cpp:
+        (WebCore::IndefiniteSizeStrategy::freeSpaceForStretchAutoTracksStep const):
+        Check if minSize is null before trying to access it's value.
+
 2018-06-29  David Fenton  <[email protected]>
 
         Unreviewed, rolling out r233349.

Modified: trunk/Source/WebCore/rendering/GridTrackSizingAlgorithm.cpp (233364 => 233365)


--- trunk/Source/WebCore/rendering/GridTrackSizingAlgorithm.cpp	2018-06-29 18:12:50 UTC (rev 233364)
+++ trunk/Source/WebCore/rendering/GridTrackSizingAlgorithm.cpp	2018-06-29 18:54:41 UTC (rev 233365)
@@ -908,6 +908,8 @@
         return LayoutUnit();
 
     auto minSize = renderGrid()->computeContentLogicalHeight(MinSize, renderGrid()->style().logicalMinHeight(), std::nullopt);
+    if (!minSize)
+        return LayoutUnit();
     return minSize.value() - computeTrackBasedSize();
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to