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

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

Issue 189913012: Merge SVGColor into SVGPaint (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix system color test 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
« no previous file with comments | « Source/core/css/CSSValue.cpp ('k') | 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 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 190
191 bool parseLineHeight(bool important); 191 bool parseLineHeight(bool important);
192 bool parseFontSize(bool important); 192 bool parseFontSize(bool important);
193 bool parseFontVariant(bool important); 193 bool parseFontVariant(bool important);
194 bool parseFontWeight(bool important); 194 bool parseFontWeight(bool important);
195 bool parseFontFaceSrc(); 195 bool parseFontFaceSrc();
196 bool parseFontFaceUnicodeRange(); 196 bool parseFontFaceUnicodeRange();
197 197
198 bool parseSVGValue(CSSPropertyID propId, bool important); 198 bool parseSVGValue(CSSPropertyID propId, bool important);
199 PassRefPtrWillBeRawPtr<CSSValue> parseSVGPaint(); 199 PassRefPtrWillBeRawPtr<CSSValue> parseSVGPaint();
200 PassRefPtrWillBeRawPtr<CSSValue> parseSVGColor();
201 PassRefPtrWillBeRawPtr<CSSValue> parseSVGStrokeDasharray(); 200 PassRefPtrWillBeRawPtr<CSSValue> parseSVGStrokeDasharray();
202 201
203 PassRefPtrWillBeRawPtr<CSSValue> parsePaintOrder() const; 202 PassRefPtrWillBeRawPtr<CSSValue> parsePaintOrder() const;
204 203
205 // CSS3 Parsing Routines (for properties specific to CSS3) 204 // CSS3 Parsing Routines (for properties specific to CSS3)
206 PassRefPtrWillBeRawPtr<CSSValueList> parseShadow(CSSParserValueList*, CSSPro pertyID); 205 PassRefPtrWillBeRawPtr<CSSValueList> parseShadow(CSSParserValueList*, CSSPro pertyID);
207 bool parseBorderImageShorthand(CSSPropertyID, bool important); 206 bool parseBorderImageShorthand(CSSPropertyID, bool important);
208 PassRefPtrWillBeRawPtr<CSSValue> parseBorderImage(CSSPropertyID); 207 PassRefPtrWillBeRawPtr<CSSValue> parseBorderImage(CSSPropertyID);
209 bool parseBorderImageRepeat(RefPtrWillBeRawPtr<CSSValue>&); 208 bool parseBorderImageRepeat(RefPtrWillBeRawPtr<CSSValue>&);
210 bool parseBorderImageSlice(CSSPropertyID, RefPtrWillBeRawPtr<CSSBorderImageS liceValue>&); 209 bool parseBorderImageSlice(CSSPropertyID, RefPtrWillBeRawPtr<CSSBorderImageS liceValue>&);
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 CSSPropertyID cssPropertyID(const CSSParserString&); 402 CSSPropertyID cssPropertyID(const CSSParserString&);
404 CSSPropertyID cssPropertyID(const String&); 403 CSSPropertyID cssPropertyID(const String&);
405 CSSValueID cssValueKeywordID(const CSSParserString&); 404 CSSValueID cssValueKeywordID(const CSSParserString&);
406 405
407 bool isKeywordPropertyID(CSSPropertyID); 406 bool isKeywordPropertyID(CSSPropertyID);
408 bool isValidKeywordPropertyAndValue(CSSPropertyID, int valueID, const CSSParserC ontext&); 407 bool isValidKeywordPropertyAndValue(CSSPropertyID, int valueID, const CSSParserC ontext&);
409 408
410 } // namespace WebCore 409 } // namespace WebCore
411 410
412 #endif // CSSPropertyParser_h 411 #endif // CSSPropertyParser_h
OLDNEW
« no previous file with comments | « Source/core/css/CSSValue.cpp ('k') | Source/core/css/parser/CSSPropertyParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698