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

Unified Diff: Source/core/css/parser/CSSPropertyParser.h

Issue 149373004: [CSS Grid Layout] Implementation of the grid-template shorthand. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@grid-template-working
Patch Set: rebased and applied suggested changes. Created 6 years, 10 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
Index: Source/core/css/parser/CSSPropertyParser.h
diff --git a/Source/core/css/parser/CSSPropertyParser.h b/Source/core/css/parser/CSSPropertyParser.h
index 037b6467083ba664d8185381b29a51646373adfd..ca38b3f0ab411cb480a22eef49d63d5bd874e56f 100644
--- a/Source/core/css/parser/CSSPropertyParser.h
+++ b/Source/core/css/parser/CSSPropertyParser.h
@@ -29,6 +29,7 @@
#include "core/css/CSSCalculationValue.h"
#include "core/css/CSSFilterValue.h"
#include "core/css/CSSGradientValue.h"
+#include "core/css/CSSGridTemplateAreasValue.h"
#include "core/css/CSSParserMode.h"
#include "core/css/CSSParserValues.h"
#include "core/css/CSSProperty.h"
@@ -50,6 +51,7 @@ class CSSValue;
class CSSValueList;
class CSSBasicShape;
class CSSBasicShapeInset;
+class CSSGridLineNamesValue;
class Document;
class Element;
class ImmutableStylePropertySet;
@@ -149,14 +151,17 @@ private:
PassRefPtrWillBeRawPtr<CSSValue> parseGridPosition();
bool parseIntegerOrStringFromGridPosition(RefPtrWillBeRawPtr<CSSPrimitiveValue>& numericValue, RefPtrWillBeRawPtr<CSSPrimitiveValue>& gridLineName);
bool parseGridItemPositionShorthand(CSSPropertyID, bool important);
+ bool parseGridTemplateRowsAndAreas(PassRefPtrWillBeRawPtr<CSSValue>, bool important);
+ bool parseGridTemplateShorthand(bool important);
bool parseGridAreaShorthand(bool important);
bool parseSingleGridAreaLonghand(RefPtrWillBeRawPtr<CSSValue>&);
- bool parseGridTrackList(CSSPropertyID, bool important);
+ PassRefPtrWillBeRawPtr<CSSValue> parseGridTrackList(bool important);
bool parseGridTrackRepeatFunction(CSSValueList&);
PassRefPtrWillBeRawPtr<CSSValue> parseGridTrackSize(CSSParserValueList& inputList);
PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseGridBreadth(CSSParserValue*);
+ bool parseGridTemplateAreasRow(NamedGridAreaMap&, const size_t, size_t&);
PassRefPtrWillBeRawPtr<CSSValue> parseGridTemplateAreas();
- void parseGridLineNames(CSSParserValueList* inputList, CSSValueList&);
+ void parseGridLineNames(CSSParserValueList* inputList, CSSValueList&, CSSGridLineNamesValue* = 0);
bool parseClipShape(CSSPropertyID, bool important);

Powered by Google App Engine
This is Rietveld 408576698