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

Side by Side 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: Patch rebased and adapted to the new parsing approach. Created 6 years, 9 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 11 matching lines...) Expand all
22 22
23 #ifndef CSSPropertyParser_h 23 #ifndef CSSPropertyParser_h
24 #define CSSPropertyParser_h 24 #define CSSPropertyParser_h
25 25
26 // FIXME: Way too many. 26 // FIXME: Way too many.
27 #include "CSSPropertyNames.h" 27 #include "CSSPropertyNames.h"
28 #include "CSSValueKeywords.h" 28 #include "CSSValueKeywords.h"
29 #include "core/css/CSSCalculationValue.h" 29 #include "core/css/CSSCalculationValue.h"
30 #include "core/css/CSSFilterValue.h" 30 #include "core/css/CSSFilterValue.h"
31 #include "core/css/CSSGradientValue.h" 31 #include "core/css/CSSGradientValue.h"
32 #include "core/css/CSSGridTemplateAreasValue.h"
32 #include "core/css/CSSParserMode.h" 33 #include "core/css/CSSParserMode.h"
33 #include "core/css/CSSParserValues.h" 34 #include "core/css/CSSParserValues.h"
34 #include "core/css/CSSProperty.h" 35 #include "core/css/CSSProperty.h"
35 #include "core/css/CSSPropertySourceData.h" 36 #include "core/css/CSSPropertySourceData.h"
36 #include "core/css/CSSSelector.h" 37 #include "core/css/CSSSelector.h"
37 #include "platform/graphics/Color.h" 38 #include "platform/graphics/Color.h"
38 #include "wtf/OwnPtr.h" 39 #include "wtf/OwnPtr.h"
39 #include "wtf/Vector.h" 40 #include "wtf/Vector.h"
40 41
41 namespace WebCore { 42 namespace WebCore {
42 43
43 // FIXME: Many of these may not be used. 44 // FIXME: Many of these may not be used.
44 class AnimationParseContext; 45 class AnimationParseContext;
45 class CSSArrayFunctionValue; 46 class CSSArrayFunctionValue;
46 class CSSBorderImageSliceValue; 47 class CSSBorderImageSliceValue;
47 class CSSPrimitiveValue; 48 class CSSPrimitiveValue;
48 class CSSSelectorList; 49 class CSSSelectorList;
49 class CSSValue; 50 class CSSValue;
50 class CSSValueList; 51 class CSSValueList;
51 class CSSBasicShape; 52 class CSSBasicShape;
52 class CSSBasicShapeInset; 53 class CSSBasicShapeInset;
54 class CSSGridLineNamesValue;
53 class Document; 55 class Document;
54 class Element; 56 class Element;
55 class ImmutableStylePropertySet; 57 class ImmutableStylePropertySet;
56 class StyleKeyframe; 58 class StyleKeyframe;
57 class StylePropertyShorthand; 59 class StylePropertyShorthand;
58 class StyleKeyframe; 60 class StyleKeyframe;
59 class UseCounter; 61 class UseCounter;
60 62
61 // Inputs: PropertyID, isImportant bool, CSSParserValueList. 63 // Inputs: PropertyID, isImportant bool, CSSParserValueList.
62 // Outputs: Vector of CSSProperties 64 // Outputs: Vector of CSSProperties
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 bool parseTransitionShorthand(CSSPropertyID, bool important); 145 bool parseTransitionShorthand(CSSPropertyID, bool important);
144 bool parseAnimationShorthand(CSSPropertyID, bool important); 146 bool parseAnimationShorthand(CSSPropertyID, bool important);
145 147
146 PassRefPtrWillBeRawPtr<CSSValue> parseColumnWidth(); 148 PassRefPtrWillBeRawPtr<CSSValue> parseColumnWidth();
147 PassRefPtrWillBeRawPtr<CSSValue> parseColumnCount(); 149 PassRefPtrWillBeRawPtr<CSSValue> parseColumnCount();
148 bool parseColumnsShorthand(bool important); 150 bool parseColumnsShorthand(bool important);
149 151
150 PassRefPtrWillBeRawPtr<CSSValue> parseGridPosition(); 152 PassRefPtrWillBeRawPtr<CSSValue> parseGridPosition();
151 bool parseIntegerOrStringFromGridPosition(RefPtrWillBeRawPtr<CSSPrimitiveVal ue>& numericValue, RefPtrWillBeRawPtr<CSSPrimitiveValue>& gridLineName); 153 bool parseIntegerOrStringFromGridPosition(RefPtrWillBeRawPtr<CSSPrimitiveVal ue>& numericValue, RefPtrWillBeRawPtr<CSSPrimitiveValue>& gridLineName);
152 bool parseGridItemPositionShorthand(CSSPropertyID, bool important); 154 bool parseGridItemPositionShorthand(CSSPropertyID, bool important);
155 bool parseGridTemplateRowsAndAreas(PassRefPtrWillBeRawPtr<CSSValue>, bool im portant);
156 bool parseGridTemplateShorthand(bool important);
153 bool parseGridAreaShorthand(bool important); 157 bool parseGridAreaShorthand(bool important);
154 bool parseSingleGridAreaLonghand(RefPtrWillBeRawPtr<CSSValue>&); 158 bool parseSingleGridAreaLonghand(RefPtrWillBeRawPtr<CSSValue>&);
155 bool parseGridTrackList(CSSPropertyID, bool important); 159 PassRefPtrWillBeRawPtr<CSSValue> parseGridTrackList(bool important);
156 bool parseGridTrackRepeatFunction(CSSValueList&); 160 bool parseGridTrackRepeatFunction(CSSValueList&);
157 PassRefPtrWillBeRawPtr<CSSValue> parseGridTrackSize(CSSParserValueList& inpu tList); 161 PassRefPtrWillBeRawPtr<CSSValue> parseGridTrackSize(CSSParserValueList& inpu tList);
158 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseGridBreadth(CSSParserValue*); 162 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseGridBreadth(CSSParserValue*);
163 bool parseGridTemplateAreasRow(NamedGridAreaMap&, const size_t, size_t&);
159 PassRefPtrWillBeRawPtr<CSSValue> parseGridTemplateAreas(); 164 PassRefPtrWillBeRawPtr<CSSValue> parseGridTemplateAreas();
160 void parseGridLineNames(CSSParserValueList* inputList, CSSValueList&); 165 void parseGridLineNames(CSSParserValueList&, CSSValueList&, CSSGridLineNames Value* = 0);
161 166
162 bool parseClipShape(CSSPropertyID, bool important); 167 bool parseClipShape(CSSPropertyID, bool important);
163 168
164 bool parseItemPositionOverflowPosition(CSSPropertyID, bool important); 169 bool parseItemPositionOverflowPosition(CSSPropertyID, bool important);
165 170
166 PassRefPtrWillBeRawPtr<CSSValue> parseShapeProperty(CSSPropertyID propId); 171 PassRefPtrWillBeRawPtr<CSSValue> parseShapeProperty(CSSPropertyID propId);
167 PassRefPtrWillBeRawPtr<CSSValue> parseBasicShapeAndOrBox(); 172 PassRefPtrWillBeRawPtr<CSSValue> parseBasicShapeAndOrBox();
168 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseBasicShape(); 173 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseBasicShape();
169 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseShapeRadius(CSSParserValue*); 174 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseShapeRadius(CSSParserValue*);
170 175
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 CSSPropertyID cssPropertyID(const CSSParserString&); 407 CSSPropertyID cssPropertyID(const CSSParserString&);
403 CSSPropertyID cssPropertyID(const String&); 408 CSSPropertyID cssPropertyID(const String&);
404 CSSValueID cssValueKeywordID(const CSSParserString&); 409 CSSValueID cssValueKeywordID(const CSSParserString&);
405 410
406 bool isKeywordPropertyID(CSSPropertyID); 411 bool isKeywordPropertyID(CSSPropertyID);
407 bool isValidKeywordPropertyAndValue(CSSPropertyID, int valueID, const CSSParserC ontext&); 412 bool isValidKeywordPropertyAndValue(CSSPropertyID, int valueID, const CSSParserC ontext&);
408 413
409 } // namespace WebCore 414 } // namespace WebCore
410 415
411 #endif // CSSPropertyParser_h 416 #endif // CSSPropertyParser_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698