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

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

Issue 1181023004: Move rem handling out of CSSParserValues.cpp (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 FFrequency = 0x0040, 65 FFrequency = 0x0040,
66 FPositiveInteger = 0x0080, 66 FPositiveInteger = 0x0080,
67 FRelative = 0x0100, 67 FRelative = 0x0100,
68 FResolution = 0x0200, 68 FResolution = 0x0200,
69 FNonNeg = 0x0400, 69 FNonNeg = 0x0400,
70 FUnitlessQuirk = 0x0800 70 FUnitlessQuirk = 0x0800
71 }; 71 };
72 72
73 static bool parseValue(CSSPropertyID, bool important, 73 static bool parseValue(CSSPropertyID, bool important,
74 CSSParserValueList*, const CSSParserContext&, 74 CSSParserValueList*, const CSSParserContext&,
75 WillBeHeapVector<CSSProperty, 256>&, StyleRule::Type); 75 WillBeHeapVector<CSSProperty, 256>&, StyleRule::Type, bool& usesRems);
76 76
77 static bool isSystemColor(int id); 77 static bool isSystemColor(int id);
78 78
79 private: 79 private:
80 CSSPropertyParser(CSSParserValueList*, const CSSParserContext&, 80 CSSPropertyParser(CSSParserValueList*, const CSSParserContext&,
81 WillBeHeapVector<CSSProperty, 256>&, StyleRule::Type); 81 WillBeHeapVector<CSSProperty, 256>&, StyleRule::Type);
82 82
83 bool parseValue(CSSPropertyID, bool important); 83 bool parseValue(CSSPropertyID, bool important);
84 84
85 bool inShorthand() const { return m_inParseShorthand; } 85 bool inShorthand() const { return m_inParseShorthand; }
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 const CSSParserContext& m_context; 369 const CSSParserContext& m_context;
370 370
371 // Outputs: 371 // Outputs:
372 WillBeHeapVector<CSSProperty, 256>& m_parsedProperties; 372 WillBeHeapVector<CSSProperty, 256>& m_parsedProperties;
373 StyleRule::Type m_ruleType; 373 StyleRule::Type m_ruleType;
374 374
375 // Locals during parsing: 375 // Locals during parsing:
376 int m_inParseShorthand; 376 int m_inParseShorthand;
377 CSSPropertyID m_currentShorthand; 377 CSSPropertyID m_currentShorthand;
378 bool m_implicitShorthand; 378 bool m_implicitShorthand;
379 bool m_usesRems;
379 RefPtrWillBeMember<CSSCalcValue> m_parsedCalculation; 380 RefPtrWillBeMember<CSSCalcValue> m_parsedCalculation;
380 }; 381 };
381 382
382 CSSPropertyID unresolvedCSSPropertyID(const CSSParserString&); 383 CSSPropertyID unresolvedCSSPropertyID(const CSSParserString&);
383 CSSPropertyID cssPropertyID(const String&); 384 CSSPropertyID cssPropertyID(const String&);
384 CSSValueID cssValueKeywordID(const CSSParserString&); 385 CSSValueID cssValueKeywordID(const CSSParserString&);
385 386
386 } // namespace blink 387 } // namespace blink
387 388
388 #endif // CSSPropertyParser_h 389 #endif // CSSPropertyParser_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698