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

Side by Side Diff: Source/core/css/parser/BisonCSSParser.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: Adding checks and layout tests to verify misplaced 'none' arguments. 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 3 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
4 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 4 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
5 * Copyright (C) 2009 - 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserve d. 5 * Copyright (C) 2009 - 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserve d.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 19 matching lines...) Expand all
30 #include "core/css/CSSGradientValue.h" 30 #include "core/css/CSSGradientValue.h"
31 #include "core/css/CSSParserMode.h" 31 #include "core/css/CSSParserMode.h"
32 #include "core/css/CSSParserValues.h" 32 #include "core/css/CSSParserValues.h"
33 #include "core/css/CSSProperty.h" 33 #include "core/css/CSSProperty.h"
34 #include "core/css/CSSPropertySourceData.h" 34 #include "core/css/CSSPropertySourceData.h"
35 #include "core/css/CSSSelector.h" 35 #include "core/css/CSSSelector.h"
36 #include "core/css/CSSTokenizer.h" 36 #include "core/css/CSSTokenizer.h"
37 #include "core/css/MediaQuery.h" 37 #include "core/css/MediaQuery.h"
38 #include "core/css/StylePropertySet.h" 38 #include "core/css/StylePropertySet.h"
39 #include "core/css/parser/CSSParserObserver.h" 39 #include "core/css/parser/CSSParserObserver.h"
40 #include "core/rendering/style/GridCoordinate.h"
40 #include "platform/graphics/Color.h" 41 #include "platform/graphics/Color.h"
41 #include "wtf/HashSet.h" 42 #include "wtf/HashSet.h"
42 #include "wtf/OwnPtr.h" 43 #include "wtf/OwnPtr.h"
43 #include "wtf/Vector.h" 44 #include "wtf/Vector.h"
44 #include "wtf/text/AtomicString.h" 45 #include "wtf/text/AtomicString.h"
45 #include "wtf/text/TextPosition.h" 46 #include "wtf/text/TextPosition.h"
46 47
47 namespace WebCore { 48 namespace WebCore {
48 49
49 class AnimationParseContext; 50 class AnimationParseContext;
50 class CSSArrayFunctionValue; 51 class CSSArrayFunctionValue;
51 class CSSBorderImageSliceValue; 52 class CSSBorderImageSliceValue;
52 class CSSPrimitiveValue; 53 class CSSPrimitiveValue;
53 class CSSSelectorList; 54 class CSSSelectorList;
54 class CSSValue; 55 class CSSValue;
55 class CSSValueList; 56 class CSSValueList;
56 class CSSBasicShape; 57 class CSSBasicShape;
57 class CSSBasicShapeInset; 58 class CSSBasicShapeInset;
59 class CSSGridLineNamesValue;
58 class Document; 60 class Document;
59 class Element; 61 class Element;
60 class ImmutableStylePropertySet; 62 class ImmutableStylePropertySet;
61 class MediaQueryExp; 63 class MediaQueryExp;
62 class MediaQuerySet; 64 class MediaQuerySet;
63 class MutableStylePropertySet; 65 class MutableStylePropertySet;
64 class StyleKeyframe; 66 class StyleKeyframe;
65 class StylePropertyShorthand; 67 class StylePropertyShorthand;
66 class StyleRuleBase; 68 class StyleRuleBase;
67 class StyleRuleKeyframes; 69 class StyleRuleKeyframes;
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 bool parseTransitionShorthand(CSSPropertyID, bool important); 159 bool parseTransitionShorthand(CSSPropertyID, bool important);
158 bool parseAnimationShorthand(CSSPropertyID, bool important); 160 bool parseAnimationShorthand(CSSPropertyID, bool important);
159 161
160 PassRefPtr<CSSValue> parseColumnWidth(); 162 PassRefPtr<CSSValue> parseColumnWidth();
161 PassRefPtr<CSSValue> parseColumnCount(); 163 PassRefPtr<CSSValue> parseColumnCount();
162 bool parseColumnsShorthand(bool important); 164 bool parseColumnsShorthand(bool important);
163 165
164 PassRefPtr<CSSValue> parseGridPosition(); 166 PassRefPtr<CSSValue> parseGridPosition();
165 bool parseIntegerOrStringFromGridPosition(RefPtrWillBeRawPtr<CSSPrimitiveVal ue>& numericValue, RefPtrWillBeRawPtr<CSSPrimitiveValue>& gridLineName); 167 bool parseIntegerOrStringFromGridPosition(RefPtrWillBeRawPtr<CSSPrimitiveVal ue>& numericValue, RefPtrWillBeRawPtr<CSSPrimitiveValue>& gridLineName);
166 bool parseGridItemPositionShorthand(CSSPropertyID, bool important); 168 bool parseGridItemPositionShorthand(CSSPropertyID, bool important);
169 bool parseGridTemplateShorthand(bool important);
170 bool parseGridTemplateAreasRow(NamedGridAreaMap&, const size_t, size_t&);
167 bool parseGridAreaShorthand(bool important); 171 bool parseGridAreaShorthand(bool important);
168 bool parseSingleGridAreaLonghand(RefPtr<CSSValue>&); 172 bool parseSingleGridAreaLonghand(RefPtr<CSSValue>&);
169 bool parseGridTrackList(CSSPropertyID, bool important); 173 bool parseGridTrackList(CSSPropertyID, bool important);
170 bool parseGridTrackRepeatFunction(CSSValueList&); 174 bool parseGridTrackRepeatFunction(CSSValueList&);
171 PassRefPtr<CSSValue> parseGridTrackSize(CSSParserValueList& inputList); 175 PassRefPtr<CSSValue> parseGridTrackSize(CSSParserValueList& inputList);
172 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseGridBreadth(CSSParserValue*); 176 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseGridBreadth(CSSParserValue*);
173 PassRefPtr<CSSValue> parseGridTemplateAreas(); 177 PassRefPtr<CSSValue> parseGridTemplateAreas();
174 void parseGridLineNames(CSSParserValueList* inputList, CSSValueList&); 178 void parseGridLineNames(CSSParserValueList* inputList, CSSValueList&, CSSGri dLineNamesValue* = 0);
175 179
176 bool parseClipShape(CSSPropertyID, bool important); 180 bool parseClipShape(CSSPropertyID, bool important);
177 181
178 bool parseItemPositionOverflowPosition(CSSPropertyID, bool important); 182 bool parseItemPositionOverflowPosition(CSSPropertyID, bool important);
179 183
180 PassRefPtr<CSSValue> parseShapeProperty(CSSPropertyID propId); 184 PassRefPtr<CSSValue> parseShapeProperty(CSSPropertyID propId);
181 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseBasicShape(); 185 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseBasicShape();
182 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseShapeRadius(CSSParserValue*); 186 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseShapeRadius(CSSParserValue*);
183 187
184 PassRefPtr<CSSBasicShape> parseBasicShapeRectangle(CSSParserValueList* args) ; 188 PassRefPtr<CSSBasicShape> parseBasicShapeRectangle(CSSParserValueList* args) ;
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
617 bool isValidNthToken(const CSSParserString&); 621 bool isValidNthToken(const CSSParserString&);
618 622
619 inline int cssyylex(void* yylval, BisonCSSParser* parser) 623 inline int cssyylex(void* yylval, BisonCSSParser* parser)
620 { 624 {
621 return parser->m_tokenizer.lex(yylval); 625 return parser->m_tokenizer.lex(yylval);
622 } 626 }
623 627
624 } // namespace WebCore 628 } // namespace WebCore
625 629
626 #endif // BisonCSSParser_h 630 #endif // BisonCSSParser_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698