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

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

Issue 184693003: Merge SVGCSSParser into CSSPropertyParser.cpp (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Move isSystemColor to CSSPropertyParser for better reuse 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 const CSSParserContext&, bool inViewport, bool savedImportant, 69 const CSSParserContext&, bool inViewport, bool savedImportant,
70 ParsedPropertyVector&, bool& hasFontFaceOnlyValues); 70 ParsedPropertyVector&, bool& hasFontFaceOnlyValues);
71 ~CSSPropertyParser(); 71 ~CSSPropertyParser();
72 72
73 // FIXME: Should this be on a separate ColorParser object? 73 // FIXME: Should this be on a separate ColorParser object?
74 template<typename StringType> 74 template<typename StringType>
75 static bool fastParseColor(RGBA32&, const StringType&, bool strict); 75 static bool fastParseColor(RGBA32&, const StringType&, bool strict);
76 76
77 bool parseValue(CSSPropertyID, bool important); 77 bool parseValue(CSSPropertyID, bool important);
78 78
79 static bool isSystemColor(int id);
80
79 private: 81 private:
80 bool inShorthand() const { return m_inParseShorthand; } 82 bool inShorthand() const { return m_inParseShorthand; }
81 bool inQuirksMode() const { return isQuirksModeBehavior(m_context.mode()); } 83 bool inQuirksMode() const { return isQuirksModeBehavior(m_context.mode()); }
82 84
83 bool inViewport() const { return m_inViewport; } 85 bool inViewport() const { return m_inViewport; }
84 bool parseViewportProperty(CSSPropertyID propId, bool important); 86 bool parseViewportProperty(CSSPropertyID propId, bool important);
85 bool parseViewportShorthand(CSSPropertyID propId, CSSPropertyID first, CSSPr opertyID second, bool important); 87 bool parseViewportShorthand(CSSPropertyID propId, CSSPropertyID first, CSSPr opertyID second, bool important);
86 88
87 KURL completeURL(const String& url) const; 89 KURL completeURL(const String& url) const;
88 90
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 402
401 CSSPropertyID cssPropertyID(const CSSParserString&); 403 CSSPropertyID cssPropertyID(const CSSParserString&);
402 CSSPropertyID cssPropertyID(const String&); 404 CSSPropertyID cssPropertyID(const String&);
403 CSSValueID cssValueKeywordID(const CSSParserString&); 405 CSSValueID cssValueKeywordID(const CSSParserString&);
404 406
405 bool isValidNthToken(const CSSParserString&); 407 bool isValidNthToken(const CSSParserString&);
406 408
407 } // namespace WebCore 409 } // namespace WebCore
408 410
409 #endif // CSSPropertyParser_h 411 #endif // CSSPropertyParser_h
OLDNEW
« no previous file with comments | « Source/core/css/parser/BisonCSSParser-in.cpp ('k') | Source/core/css/parser/CSSPropertyParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698