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

Side by Side Diff: third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h

Issue 1399003004: Move columns related properties into CSSPropertyParser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 2 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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 PassRefPtrWillBeRawPtr<CSSValue> parseAnimationTimingFunction(); 150 PassRefPtrWillBeRawPtr<CSSValue> parseAnimationTimingFunction();
151 151
152 bool parseCubicBezierTimingFunctionValue(CSSParserValueList*& args, double& result); 152 bool parseCubicBezierTimingFunctionValue(CSSParserValueList*& args, double& result);
153 153
154 // Legacy parsing allows <string>s for animation-name 154 // Legacy parsing allows <string>s for animation-name
155 PassRefPtrWillBeRawPtr<CSSValue> parseAnimationProperty(CSSPropertyID, bool useLegacyParsing); 155 PassRefPtrWillBeRawPtr<CSSValue> parseAnimationProperty(CSSPropertyID, bool useLegacyParsing);
156 PassRefPtrWillBeRawPtr<CSSValueList> parseAnimationPropertyList(CSSPropertyI D, bool useLegacyParsing); 156 PassRefPtrWillBeRawPtr<CSSValueList> parseAnimationPropertyList(CSSPropertyI D, bool useLegacyParsing);
157 bool parseAnimationShorthand(bool useLegacyParsing, bool important); 157 bool parseAnimationShorthand(bool useLegacyParsing, bool important);
158 bool parseTransitionShorthand(bool important); 158 bool parseTransitionShorthand(bool important);
159 159
160 PassRefPtrWillBeRawPtr<CSSValue> parseColumnWidth(); 160 bool consumeColumns(bool important);
161 PassRefPtrWillBeRawPtr<CSSValue> parseColumnCount();
162 bool parseColumnsShorthand(bool important);
163 161
164 PassRefPtrWillBeRawPtr<CSSValue> parseGridPosition(); 162 PassRefPtrWillBeRawPtr<CSSValue> parseGridPosition();
165 bool parseIntegerOrCustomIdentFromGridPosition(RefPtrWillBeRawPtr<CSSPrimiti veValue>& numericValue, RefPtrWillBeRawPtr<CSSCustomIdentValue>& gridLineName); 163 bool parseIntegerOrCustomIdentFromGridPosition(RefPtrWillBeRawPtr<CSSPrimiti veValue>& numericValue, RefPtrWillBeRawPtr<CSSCustomIdentValue>& gridLineName);
166 bool parseGridItemPositionShorthand(CSSPropertyID, bool important); 164 bool parseGridItemPositionShorthand(CSSPropertyID, bool important);
167 bool parseGridTemplateRowsAndAreas(PassRefPtrWillBeRawPtr<CSSValue>, bool im portant); 165 bool parseGridTemplateRowsAndAreas(PassRefPtrWillBeRawPtr<CSSValue>, bool im portant);
168 bool parseGridTemplateShorthand(bool important); 166 bool parseGridTemplateShorthand(bool important);
169 bool parseGridShorthand(bool important); 167 bool parseGridShorthand(bool important);
170 bool parseGridAreaShorthand(bool important); 168 bool parseGridAreaShorthand(bool important);
171 bool parseGridGapShorthand(bool important); 169 bool parseGridGapShorthand(bool important);
172 bool parseSingleGridAreaLonghand(RefPtrWillBeRawPtr<CSSValue>&); 170 bool parseSingleGridAreaLonghand(RefPtrWillBeRawPtr<CSSValue>&);
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 bool m_implicitShorthand; 357 bool m_implicitShorthand;
360 RefPtrWillBeMember<CSSCalcValue> m_parsedCalculation; 358 RefPtrWillBeMember<CSSCalcValue> m_parsedCalculation;
361 }; 359 };
362 360
363 CSSPropertyID unresolvedCSSPropertyID(const CSSParserString&); 361 CSSPropertyID unresolvedCSSPropertyID(const CSSParserString&);
364 CSSValueID cssValueKeywordID(const CSSParserString&); 362 CSSValueID cssValueKeywordID(const CSSParserString&);
365 363
366 } // namespace blink 364 } // namespace blink
367 365
368 #endif // CSSPropertyParser_h 366 #endif // CSSPropertyParser_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698