third_party/WebKit/Source/core/css/parser/CSSParser.h - Issue 2040853002: Changed CSSParser::parseFontFaceDescriptor to return a const CSSValue*

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

Issue 2040853002: Changed CSSParser::parseFontFaceDescriptor to return a const CSSValue* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@_fix_copy_locs

Patch Set: Rebase Created 4 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

« no previous file with comments | « third_party/WebKit/Source/core/css/FontFace.cpp ('k') | third_party/WebKit/Source/core/css/parser/CSSParser.cpp » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CSSParser_h	5 #ifndef CSSParser_h

6 #define CSSParser_h	6 #define CSSParser_h

7	7

8 #include "core/CSSPropertyNames.h"	8 #include "core/CSSPropertyNames.h"

9 #include "core/CoreExport.h"	9 #include "core/CoreExport.h"

10 #include "core/css/CSSValue.h"	10 #include "core/css/CSSValue.h"

(...skipping 25 matching lines...) Expand all Loading...
36 static bool parseDeclarationList(const CSSParserContext&, MutableStyleProper tySet*, const String&);	36 static bool parseDeclarationList(const CSSParserContext&, MutableStyleProper tySet*, const String&);

37 // Returns whether anything was changed.	37 // Returns whether anything was changed.

38 static bool parseValue(MutableStylePropertySet, CSSPropertyID unresolvedPro perty, const String&, bool important, StyleSheetContents);	38 static bool parseValue(MutableStylePropertySet, CSSPropertyID unresolvedPro perty, const String&, bool important, StyleSheetContents);

39	39

40 static bool parseValueForCustomProperty(MutableStylePropertySet, const Atom icString& propertyName, const String& value, bool important, StyleSheetContents );	40 static bool parseValueForCustomProperty(MutableStylePropertySet, const Atom icString& propertyName, const String& value, bool important, StyleSheetContents );

41 static ImmutableStylePropertySet* parseCustomPropertySet(CSSParserTokenRange );	41 static ImmutableStylePropertySet* parseCustomPropertySet(CSSParserTokenRange );

42	42

43 // This is for non-shorthands only	43 // This is for non-shorthands only

44 static CSSValue* parseSingleValue(CSSPropertyID, const String&, const CSSPar serContext& = strictCSSParserContext());	44 static CSSValue* parseSingleValue(CSSPropertyID, const String&, const CSSPar serContext& = strictCSSParserContext());

45	45

46 static CSSValue* parseFontFaceDescriptor(CSSPropertyID, const String&, const CSSParserContext&);	46 static const CSSValue* parseFontFaceDescriptor(CSSPropertyID, const String&, const CSSParserContext&);

47	47

48 static ImmutableStylePropertySet* parseInlineStyleDeclaration(const String&, Element*);	48 static ImmutableStylePropertySet* parseInlineStyleDeclaration(const String&, Element*);

49	49

50 static PassOwnPtr<Vector<double>> parseKeyframeKeyList(const String&);	50 static PassOwnPtr<Vector<double>> parseKeyframeKeyList(const String&);

51 static StyleRuleKeyframe* parseKeyframeRule(const CSSParserContext&, const S tring&);	51 static StyleRuleKeyframe* parseKeyframeRule(const CSSParserContext&, const S tring&);

52	52

53 static bool parseSupportsCondition(const String&);	53 static bool parseSupportsCondition(const String&);

54	54

55 // The color will only be changed when string contains a valid CSS color, so callers	55 // The color will only be changed when string contains a valid CSS color, so callers

56 // can set it to a default color and ignore the boolean result.	56 // can set it to a default color and ignore the boolean result.

57 static bool parseColor(Color&, const String&, bool strict = false);	57 static bool parseColor(Color&, const String&, bool strict = false);

58 static bool parseSystemColor(Color&, const String&);	58 static bool parseSystemColor(Color&, const String&);

59	59

60 static void parseSheetForInspector(const CSSParserContext&, StyleSheetConten ts*, const String&, CSSParserObserver&);	60 static void parseSheetForInspector(const CSSParserContext&, StyleSheetConten ts*, const String&, CSSParserObserver&);

61 static void parseDeclarationListForInspector(const CSSParserContext&, const String&, CSSParserObserver&);	61 static void parseDeclarationListForInspector(const CSSParserContext&, const String&, CSSParserObserver&);

62	62

63 private:	63 private:

64 static bool parseValue(MutableStylePropertySet*, CSSPropertyID unresolvedPro perty, const String&, bool important, const CSSParserContext&);	64 static bool parseValue(MutableStylePropertySet*, CSSPropertyID unresolvedPro perty, const String&, bool important, const CSSParserContext&);

65 };	65 };

66	66

67 } // namespace blink	67 } // namespace blink

68	68

69 #endif // CSSParser_h	69 #endif // CSSParser_h

OLD	NEW