diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/css/CSSParser.h | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/css/CSSParser.h')
| -rw-r--r-- | Source/WebCore/css/CSSParser.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Source/WebCore/css/CSSParser.h b/Source/WebCore/css/CSSParser.h index d326812..6ccfbe2 100644 --- a/Source/WebCore/css/CSSParser.h +++ b/Source/WebCore/css/CSSParser.h @@ -64,6 +64,7 @@ namespace WebCore { PassRefPtr<CSSRule> parseKeyframeRule(CSSStyleSheet*, const String&); bool parseValue(CSSMutableStyleDeclaration*, int propId, const String&, bool important); static bool parseColor(RGBA32& color, const String&, bool strict = false); + static bool parseSystemColor(RGBA32& color, const String&, Document*); bool parseColor(CSSMutableStyleDeclaration*, const String&); bool parseDeclaration(CSSMutableStyleDeclaration*, const String&, RefPtr<CSSStyleSourceData>* styleSourceData = 0); bool parseMediaQuery(MediaList*, const String&); @@ -170,8 +171,8 @@ namespace WebCore { int yyparse(); - CSSSelector* createFloatingSelector(); - CSSSelector* sinkFloatingSelector(CSSSelector*); + CSSParserSelector* createFloatingSelector(); + PassOwnPtr<CSSParserSelector> sinkFloatingSelector(CSSParserSelector*); CSSParserValueList* createFloatingValueList(); CSSParserValueList* sinkFloatingValueList(CSSParserValueList*); @@ -188,9 +189,9 @@ namespace WebCore { WebKitCSSKeyframesRule* createKeyframesRule(); CSSRule* createMediaRule(MediaList*, CSSRuleList*); CSSRuleList* createRuleList(); - CSSRule* createStyleRule(Vector<CSSSelector*>* selectors); + CSSRule* createStyleRule(Vector<OwnPtr<CSSParserSelector> >* selectors); CSSRule* createFontFaceRule(); - CSSRule* createPageRule(CSSSelector* pageSelector); + CSSRule* createPageRule(PassOwnPtr<CSSParserSelector> pageSelector); CSSRule* createMarginAtRule(CSSSelector::MarginBoxType marginBox); void startDeclarationsForMarginBox(); void endDeclarationsForMarginBox(); @@ -204,11 +205,11 @@ namespace WebCore { PassOwnPtr<MediaQuery> sinkFloatingMediaQuery(MediaQuery*); void addNamespace(const AtomicString& prefix, const AtomicString& uri); - void updateSpecifiersWithElementName(const AtomicString& namespacePrefix, const AtomicString& elementName, CSSSelector*); + void updateSpecifiersWithElementName(const AtomicString& namespacePrefix, const AtomicString& elementName, CSSParserSelector*); void invalidBlockHit(); - Vector<CSSSelector*>* reusableSelectorVector() { return &m_reusableSelectorVector; } + Vector<OwnPtr<CSSParserSelector> >* reusableSelectorVector() { return &m_reusableSelectorVector; } void updateLastSelectorLineAndPosition(); @@ -302,7 +303,7 @@ namespace WebCore { Vector<RefPtr<StyleBase> > m_parsedStyleObjects; Vector<RefPtr<CSSRuleList> > m_parsedRuleLists; - HashSet<CSSSelector*> m_floatingSelectors; + HashSet<CSSParserSelector*> m_floatingSelectors; HashSet<CSSParserValueList*> m_floatingValueLists; HashSet<CSSParserFunction*> m_floatingFunctions; @@ -310,7 +311,7 @@ namespace WebCore { OwnPtr<MediaQueryExp> m_floatingMediaQueryExp; OwnPtr<Vector<OwnPtr<MediaQueryExp> > > m_floatingMediaQueryExpList; - Vector<CSSSelector*> m_reusableSelectorVector; + Vector<OwnPtr<CSSParserSelector> > m_reusableSelectorVector; // defines units allowed for a certain property, used in parseUnit enum Units { |