Index: Source/core/css/parser/BisonCSSParser.h |
diff --git a/Source/core/css/parser/BisonCSSParser.h b/Source/core/css/parser/BisonCSSParser.h |
index 1a32e94a35df8a7cc0bca3a130b244fb5df9143d..1770b1a8761070bf7bbb177f1504b4db02aff980 100644 |
--- a/Source/core/css/parser/BisonCSSParser.h |
+++ b/Source/core/css/parser/BisonCSSParser.h |
@@ -37,6 +37,7 @@ |
#include "core/css/MediaQuery.h" |
#include "core/css/StylePropertySet.h" |
#include "core/css/parser/CSSParserObserver.h" |
+#include "core/rendering/style/GridCoordinate.h" |
#include "platform/graphics/Color.h" |
#include "wtf/HashSet.h" |
#include "wtf/OwnPtr.h" |
@@ -55,6 +56,7 @@ class CSSValue; |
class CSSValueList; |
class CSSBasicShape; |
class CSSBasicShapeInset; |
+class CSSGridLineNamesValue; |
class Document; |
class Element; |
class ImmutableStylePropertySet; |
@@ -164,14 +166,17 @@ public: |
PassRefPtr<CSSValue> parseGridPosition(); |
bool parseIntegerOrStringFromGridPosition(RefPtrWillBeRawPtr<CSSPrimitiveValue>& numericValue, RefPtrWillBeRawPtr<CSSPrimitiveValue>& gridLineName); |
bool parseGridItemPositionShorthand(CSSPropertyID, bool important); |
+ bool parseGridTemplateShorthand(bool important); |
+ bool parseGridTemplateRowsAndAreas(bool important); |
+ bool parseGridTemplateAreasRow(NamedGridAreaMap&, const size_t, size_t&); |
bool parseGridAreaShorthand(bool important); |
bool parseSingleGridAreaLonghand(RefPtr<CSSValue>&); |
- bool parseGridTrackList(CSSPropertyID, bool important); |
+ PassRefPtr<CSSValue> parseGridTrackList(bool important); |
bool parseGridTrackRepeatFunction(CSSValueList&); |
PassRefPtr<CSSValue> parseGridTrackSize(CSSParserValueList& inputList); |
PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseGridBreadth(CSSParserValue*); |
PassRefPtr<CSSValue> parseGridTemplateAreas(); |
- void parseGridLineNames(CSSParserValueList* inputList, CSSValueList&); |
+ void parseGridLineNames(CSSParserValueList* inputList, CSSValueList&, CSSGridLineNamesValue* = 0); |
bool parseClipShape(CSSPropertyID, bool important); |