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

Side by Side Diff: Source/WebCore/css/CSSParser.h

Issue 13674002: Support intrinsic values for height, min-height and max-height (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: better fixme comment Created 7 years, 8 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 class MediaQuerySet; 58 class MediaQuerySet;
59 class StyleKeyframe; 59 class StyleKeyframe;
60 class StylePropertySet; 60 class StylePropertySet;
61 class StylePropertyShorthand; 61 class StylePropertyShorthand;
62 class StyleRuleBase; 62 class StyleRuleBase;
63 class StyleRuleKeyframes; 63 class StyleRuleKeyframes;
64 class StyleKeyframe; 64 class StyleKeyframe;
65 class StyleSheetContents; 65 class StyleSheetContents;
66 class StyledElement; 66 class StyledElement;
67 67
68 #if ENABLE(CSS_SHADERS) 68 #if ENABLE(CSS_SHADERS)
ojan 2013/04/12 04:03:11 I think some other changes snuck into your diff. :
cbiesinger 2013/04/12 20:30:52 Hm... I think Rietveld must be showing different t
69 class WebKitCSSArrayFunctionValue; 69 class WebKitCSSArrayFunctionValue;
70 class WebKitCSSMixFunctionValue; 70 class WebKitCSSMixFunctionValue;
71 class WebKitCSSShaderValue; 71 class WebKitCSSShaderValue;
72 #endif 72 #endif
73 73
74 class CSSParser { 74 class CSSParser {
75 friend inline int cssyylex(void*, CSSParser*); 75 friend inline int cssyylex(void*, CSSParser*);
76 76
77 public: 77 public:
78 struct Location; 78 struct Location;
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 void recheckAtKeyword(const UChar* str, int len); 526 void recheckAtKeyword(const UChar* str, int len);
527 527
528 template<unsigned prefixLength, unsigned suffixLength> 528 template<unsigned prefixLength, unsigned suffixLength>
529 inline void setupParser(const char (&prefix)[prefixLength], const String& st ring, const char (&suffix)[suffixLength]) 529 inline void setupParser(const char (&prefix)[prefixLength], const String& st ring, const char (&suffix)[suffixLength])
530 { 530 {
531 setupParser(prefix, prefixLength - 1, string, suffix, suffixLength - 1); 531 setupParser(prefix, prefixLength - 1, string, suffix, suffixLength - 1);
532 } 532 }
533 void setupParser(const char* prefix, unsigned prefixLength, const String&, c onst char* suffix, unsigned suffixLength); 533 void setupParser(const char* prefix, unsigned prefixLength, const String&, c onst char* suffix, unsigned suffixLength);
534 bool inShorthand() const { return m_inParseShorthand; } 534 bool inShorthand() const { return m_inParseShorthand; }
535 535
536 bool validWidth(CSSParserValue*); 536 bool validWidthOrHeight(CSSParserValue*);
537 bool validHeight(CSSParserValue*);
538 537
539 void deleteFontFaceOnlyValues(); 538 void deleteFontFaceOnlyValues();
540 539
541 bool isGeneratedImageValue(CSSParserValue*) const; 540 bool isGeneratedImageValue(CSSParserValue*) const;
542 bool parseGeneratedImage(CSSParserValueList*, RefPtr<CSSValue>&); 541 bool parseGeneratedImage(CSSParserValueList*, RefPtr<CSSValue>&);
543 542
544 bool parseValue(StylePropertySet*, CSSPropertyID, const String&, bool import ant, StyleSheetContents* contextStyleSheet); 543 bool parseValue(StylePropertySet*, CSSPropertyID, const String&, bool import ant, StyleSheetContents* contextStyleSheet);
545 PassRefPtr<StylePropertySet> parseDeclaration(const String&, StyleSheetConte nts* contextStyleSheet); 544 PassRefPtr<StylePropertySet> parseDeclaration(const String&, StyleSheetConte nts* contextStyleSheet);
546 545
547 enum SizeParameterType { 546 enum SizeParameterType {
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
737 } 736 }
738 737
739 inline int cssyylex(void* yylval, CSSParser* parser) 738 inline int cssyylex(void* yylval, CSSParser* parser)
740 { 739 {
741 return parser->lex(yylval); 740 return parser->lex(yylval);
742 } 741 }
743 742
744 } // namespace WebCore 743 } // namespace WebCore
745 744
746 #endif // CSSParser_h 745 #endif // CSSParser_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698