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

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: Patch for landing 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 PassRefPtrWillBeRawPtr<CSSValue> parseAnimationTimingFunction(); 151 PassRefPtrWillBeRawPtr<CSSValue> parseAnimationTimingFunction();
152 152
153 bool parseCubicBezierTimingFunctionValue(CSSParserValueList*& args, double& result); 153 bool parseCubicBezierTimingFunctionValue(CSSParserValueList*& args, double& result);
154 154
155 // Legacy parsing allows <string>s for animation-name 155 // Legacy parsing allows <string>s for animation-name
156 PassRefPtrWillBeRawPtr<CSSValue> parseAnimationProperty(CSSPropertyID, bool useLegacyParsing); 156 PassRefPtrWillBeRawPtr<CSSValue> parseAnimationProperty(CSSPropertyID, bool useLegacyParsing);
157 PassRefPtrWillBeRawPtr<CSSValueList> parseAnimationPropertyList(CSSPropertyI D, bool useLegacyParsing); 157 PassRefPtrWillBeRawPtr<CSSValueList> parseAnimationPropertyList(CSSPropertyI D, bool useLegacyParsing);
158 bool parseAnimationShorthand(bool useLegacyParsing, bool important); 158 bool parseAnimationShorthand(bool useLegacyParsing, bool important);
159 bool parseTransitionShorthand(bool important); 159 bool parseTransitionShorthand(bool important);
160 160
161 PassRefPtrWillBeRawPtr<CSSValue> parseColumnWidth(); 161 bool consumeColumns(bool important);
162 PassRefPtrWillBeRawPtr<CSSValue> parseColumnCount();
163 bool parseColumnsShorthand(bool important);
164 162
165 PassRefPtrWillBeRawPtr<CSSValue> parseGridPosition(); 163 PassRefPtrWillBeRawPtr<CSSValue> parseGridPosition();
166 bool parseIntegerOrCustomIdentFromGridPosition(RefPtrWillBeRawPtr<CSSPrimiti veValue>& numericValue, RefPtrWillBeRawPtr<CSSCustomIdentValue>& gridLineName); 164 bool parseIntegerOrCustomIdentFromGridPosition(RefPtrWillBeRawPtr<CSSPrimiti veValue>& numericValue, RefPtrWillBeRawPtr<CSSCustomIdentValue>& gridLineName);
167 bool parseGridItemPositionShorthand(CSSPropertyID, bool important); 165 bool parseGridItemPositionShorthand(CSSPropertyID, bool important);
168 bool parseGridTemplateRowsAndAreas(PassRefPtrWillBeRawPtr<CSSValue>, bool im portant); 166 bool parseGridTemplateRowsAndAreas(PassRefPtrWillBeRawPtr<CSSValue>, bool im portant);
169 bool parseGridTemplateShorthand(bool important); 167 bool parseGridTemplateShorthand(bool important);
170 bool parseGridShorthand(bool important); 168 bool parseGridShorthand(bool important);
171 bool parseGridAreaShorthand(bool important); 169 bool parseGridAreaShorthand(bool important);
172 bool parseGridGapShorthand(bool important); 170 bool parseGridGapShorthand(bool important);
173 bool parseSingleGridAreaLonghand(RefPtrWillBeRawPtr<CSSValue>&); 171 bool parseSingleGridAreaLonghand(RefPtrWillBeRawPtr<CSSValue>&);
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 bool m_implicitShorthand; 358 bool m_implicitShorthand;
361 RefPtrWillBeMember<CSSCalcValue> m_parsedCalculation; 359 RefPtrWillBeMember<CSSCalcValue> m_parsedCalculation;
362 }; 360 };
363 361
364 CSSPropertyID unresolvedCSSPropertyID(const CSSParserString&); 362 CSSPropertyID unresolvedCSSPropertyID(const CSSParserString&);
365 CSSValueID cssValueKeywordID(const CSSParserString&); 363 CSSValueID cssValueKeywordID(const CSSParserString&);
366 364
367 } // namespace blink 365 } // namespace blink
368 366
369 #endif // CSSPropertyParser_h 367 #endif // CSSPropertyParser_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698