Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(612)

Unified Diff: Source/core/css/parser/BisonCSSParser-in.cpp

Issue 113943003: [CSS Grid] Introduce an explicit type for resolved grid positions (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@to-land-zero
Patch Set: Created 6 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/CSSGridTemplateValue.cpp ('k') | Source/core/rendering/RenderGrid.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/parser/BisonCSSParser-in.cpp
diff --git a/Source/core/css/parser/BisonCSSParser-in.cpp b/Source/core/css/parser/BisonCSSParser-in.cpp
index 242ca77496414ba6278903db53cd6baeba083fb4..eaee57de5446d472b8e1b9ca2e0dfa0ceeb50298 100644
--- a/Source/core/css/parser/BisonCSSParser-in.cpp
+++ b/Source/core/css/parser/BisonCSSParser-in.cpp
@@ -83,6 +83,7 @@
#include "core/html/parser/HTMLParserIdioms.h"
#include "core/inspector/InspectorInstrumentation.h"
#include "core/rendering/RenderTheme.h"
+#include "core/rendering/style/GridResolvedPosition.h"
#include "core/svg/SVGParserUtilities.h"
#include "platform/FloatConversion.h"
#include "wtf/BitArray.h"
@@ -4953,18 +4954,18 @@ PassRefPtr<CSSValue> BisonCSSParser::parseGridTemplate()
// The following checks test that the grid area is a single filled-in rectangle.
// 1. The new row is adjacent to the previously parsed row.
- if (rowCount != gridCoordinate.rows.initialPositionIndex + 1)
+ if (rowCount != (unsigned)gridCoordinate.rows.initialPositionIndex + 1)
return 0;
// 2. The new area starts at the same position as the previously parsed area.
- if (currentCol != gridCoordinate.columns.initialPositionIndex)
+ if (currentCol != (unsigned)gridCoordinate.columns.initialPositionIndex)
return 0;
// 3. The new area ends at the same position as the previously parsed area.
- if (lookAheadCol != gridCoordinate.columns.finalPositionIndex)
+ if (lookAheadCol != (unsigned)gridCoordinate.columns.finalPositionIndex)
return 0;
- ++gridCoordinate.rows.finalPositionIndex;
+ gridCoordinate.rows.finalPositionIndex.setIntegerPosition(gridCoordinate.rows.finalPositionIndex.integerPosition() + 1);
}
currentCol = lookAheadCol;
}
« no previous file with comments | « Source/core/css/CSSGridTemplateValue.cpp ('k') | Source/core/rendering/RenderGrid.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698