diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-12-07 17:22:45 -0800 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2010-12-22 14:15:40 -0800 |
| commit | 4576aa36e9a9671459299c7963ac95aa94beaea9 (patch) | |
| tree | 3863574e050f168c0126ecb47c83319fab0972d8 /WebCore/css/CSSParser.h | |
| parent | 55323ac613cc31553107b68603cb627264d22bb0 (diff) | |
| download | external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.zip external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.gz external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.bz2 | |
Merge WebKit at r73109: Initial merge by git.
Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
Diffstat (limited to 'WebCore/css/CSSParser.h')
| -rw-r--r-- | WebCore/css/CSSParser.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebCore/css/CSSParser.h b/WebCore/css/CSSParser.h index 1da20b7..191249c 100644 --- a/WebCore/css/CSSParser.h +++ b/WebCore/css/CSSParser.h @@ -105,7 +105,7 @@ namespace WebCore { PassRefPtr<CSSValue> parseAnimationProperty(); PassRefPtr<CSSValue> parseAnimationTimingFunction(); - void parseTransformOriginShorthand(RefPtr<CSSValue>&, RefPtr<CSSValue>&, RefPtr<CSSValue>&); + bool parseTransformOriginShorthand(RefPtr<CSSValue>&, RefPtr<CSSValue>&, RefPtr<CSSValue>&); bool parseCubicBezierTimingFunctionValue(CSSParserValueList*& args, double& result); bool parseAnimationProperty(int propId, RefPtr<CSSValue>&); bool parseTransitionShorthand(bool important); @@ -230,6 +230,7 @@ namespace WebCore { AtomicString m_defaultNamespace; // tokenizer methods and data + bool m_inStyleRuleOrDeclaration; SourceRange m_selectorListRange; SourceRange m_ruleBodyRange; SourceRange m_propertyRange; |