diff options
| author | Steve Block <steveblock@google.com> | 2009-12-15 10:12:09 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-12-17 17:41:10 +0000 |
| commit | 643ca7872b450ea4efacab6188849e5aac2ba161 (patch) | |
| tree | 6982576c228bcd1a7efe98afed544d840751094c /WebCore/css/CSSParser.h | |
| parent | d026980fde6eb3b01c1fe49441174e89cd1be298 (diff) | |
| download | external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.zip external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.tar.gz external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.tar.bz2 | |
Merge webkit.org at r51976 : Initial merge by git.
Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
Diffstat (limited to 'WebCore/css/CSSParser.h')
| -rw-r--r-- | WebCore/css/CSSParser.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/WebCore/css/CSSParser.h b/WebCore/css/CSSParser.h index 6d1bb32..d032886 100644 --- a/WebCore/css/CSSParser.h +++ b/WebCore/css/CSSParser.h @@ -187,13 +187,15 @@ namespace WebCore { MediaQuery* createFloatingMediaQuery(Vector<MediaQueryExp*>*); MediaQuery* sinkFloatingMediaQuery(MediaQuery*); + void addNamespace(const AtomicString& prefix, const AtomicString& uri); + bool addVariable(const CSSParserString&, CSSParserValueList*); bool addVariableDeclarationBlock(const CSSParserString&); bool checkForVariables(CSSParserValueList*); void addUnresolvedProperty(int propId, bool important); Vector<CSSSelector*>* reusableSelectorVector() { return &m_reusableSelectorVector; } - + bool m_strict; bool m_important; int m_id; @@ -225,6 +227,8 @@ namespace WebCore { int lex(); private: + void recheckAtKeyword(const UChar* str, int len); + void clearProperties(); void setupParser(const char* prefix, const String&, const char* suffix); @@ -247,6 +251,10 @@ namespace WebCore { int yyTok; int yy_start; + bool m_allowImportRules; + bool m_allowVariablesRules; + bool m_allowNamespaceDeclarations; + Vector<RefPtr<StyleBase> > m_parsedStyleObjects; Vector<RefPtr<CSSRuleList> > m_parsedRuleLists; HashSet<CSSSelector*> m_floatingSelectors; @@ -287,7 +295,7 @@ namespace WebCore { int cssPropertyID(const String&); int cssValueKeywordID(const CSSParserString&); - class ShorthandScope { + class ShorthandScope : public FastAllocBase { public: ShorthandScope(CSSParser* parser, int propId) : m_parser(parser) { |