Title: [236834] trunk/Source/WebCore
- Revision
- 236834
- Author
- [email protected]
- Date
- 2018-10-04 09:56:11 -0700 (Thu, 04 Oct 2018)
Log Message
ENABLE(ASSERT) used in grid code when !ASSERT_DISABLED is desired
https://bugs.webkit.org/show_bug.cgi?id=190145
Reviewed by Javier Fernandez.
Replace ENABLE(ASSERT), which doesn't exist, with !ASSERT_DISABLED.
* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::placeItemsOnGrid const):
(WebCore::RenderGrid::baselinePosition const):
* rendering/style/GridArea.h:
(WebCore::GridSpan::GridSpan):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (236833 => 236834)
--- trunk/Source/WebCore/ChangeLog 2018-10-04 16:55:47 UTC (rev 236833)
+++ trunk/Source/WebCore/ChangeLog 2018-10-04 16:56:11 UTC (rev 236834)
@@ -1,3 +1,18 @@
+2018-10-04 Michael Catanzaro <[email protected]>
+
+ ENABLE(ASSERT) used in grid code when !ASSERT_DISABLED is desired
+ https://bugs.webkit.org/show_bug.cgi?id=190145
+
+ Reviewed by Javier Fernandez.
+
+ Replace ENABLE(ASSERT), which doesn't exist, with !ASSERT_DISABLED.
+
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::placeItemsOnGrid const):
+ (WebCore::RenderGrid::baselinePosition const):
+ * rendering/style/GridArea.h:
+ (WebCore::GridSpan::GridSpan):
+
2018-10-04 Dan Bernstein <[email protected]>
WebCore part of [Xcode] Update some build settings as recommended by Xcode 10
Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (236833 => 236834)
--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2018-10-04 16:55:47 UTC (rev 236833)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2018-10-04 16:56:11 UTC (rev 236834)
@@ -606,7 +606,7 @@
}
grid.setHasAnyOrthogonalGridItem(hasAnyOrthogonalGridItem);
-#if ENABLE(ASSERT)
+#if !ASSERT_DISABLED
if (grid.hasGridItems()) {
ASSERT(grid.numTracks(ForRows) >= GridPositionsResolver::explicitGridRowCount(style(), grid.autoRepeatTracks(ForRows)));
ASSERT(grid.numTracks(ForColumns) >= GridPositionsResolver::explicitGridColumnCount(style(), grid.autoRepeatTracks(ForColumns)));
@@ -622,7 +622,7 @@
grid.setNeedsItemsPlacement(false);
-#if ENABLE(ASSERT)
+#if !ASSERT_DISABLED
for (auto* child = grid.orderIterator().first(); child; child = grid.orderIterator().next()) {
if (grid.orderIterator().shouldSkipChild(*child))
continue;
@@ -1144,7 +1144,7 @@
// FIXME: This logic is shared by RenderFlexibleBox, so it might be refactored somehow.
int RenderGrid::baselinePosition(FontBaseline, bool, LineDirectionMode direction, LinePositionMode mode) const
{
-#if ENABLE(ASSERT)
+#if !ASSERT_DISABLED
ASSERT(mode == PositionOnContainingLine);
#else
UNUSED_PARAM(mode);
Modified: trunk/Source/WebCore/rendering/style/GridArea.h (236833 => 236834)
--- trunk/Source/WebCore/rendering/style/GridArea.h 2018-10-04 16:55:47 UTC (rev 236833)
+++ trunk/Source/WebCore/rendering/style/GridArea.h 2018-10-04 16:56:11 UTC (rev 236834)
@@ -148,7 +148,7 @@
GridSpan(int startLine, int endLine, GridSpanType type)
: m_type(type)
{
-#if ENABLE(ASSERT)
+#if !ASSERT_DISABLED
ASSERT(startLine < endLine);
if (type == TranslatedDefinite) {
ASSERT(startLine >= 0);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
