diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-09-08 12:18:00 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-09-11 12:08:58 +0100 |
| commit | 5ddde30071f639962dd557c453f2ad01f8f0fd00 (patch) | |
| tree | 775803c4ab35af50aa5f5472cd1fb95fe9d5152d /WebCore/css/CSSParser.h | |
| parent | 3e63d9b33b753ca86d0765d1b3d711114ba9e34f (diff) | |
| download | external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.zip external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.tar.gz external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.tar.bz2 | |
Merge WebKit at r66666 : Initial merge by git.
Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
Diffstat (limited to 'WebCore/css/CSSParser.h')
| -rw-r--r-- | WebCore/css/CSSParser.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/WebCore/css/CSSParser.h b/WebCore/css/CSSParser.h index 1e233c8..6211e62 100644 --- a/WebCore/css/CSSParser.h +++ b/WebCore/css/CSSParser.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2003 Lars Knoll (knoll@kde.org) - * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserved. * Copyright (C) 2008 Eric Seidel <eric@webkit.org> * Copyright (C) 2009 - 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved. * @@ -194,12 +194,12 @@ namespace WebCore { void endDeclarationsForMarginBox(); MediaQueryExp* createFloatingMediaQueryExp(const AtomicString&, CSSParserValueList*); - MediaQueryExp* sinkFloatingMediaQueryExp(MediaQueryExp*); + PassOwnPtr<MediaQueryExp> sinkFloatingMediaQueryExp(MediaQueryExp*); Vector<MediaQueryExp*>* createFloatingMediaQueryExpList(); - Vector<MediaQueryExp*>* sinkFloatingMediaQueryExpList(Vector<MediaQueryExp*>*); - MediaQuery* createFloatingMediaQuery(MediaQuery::Restrictor, const String&, Vector<MediaQueryExp*>*); - MediaQuery* createFloatingMediaQuery(Vector<MediaQueryExp*>*); - MediaQuery* sinkFloatingMediaQuery(MediaQuery*); + PassOwnPtr<Vector<MediaQueryExp*> > sinkFloatingMediaQueryExpList(Vector<MediaQueryExp*>*); + MediaQuery* createFloatingMediaQuery(MediaQuery::Restrictor, const String&, PassOwnPtr<Vector<MediaQueryExp*> >); + MediaQuery* createFloatingMediaQuery(PassOwnPtr<Vector<MediaQueryExp*> >); + PassOwnPtr<MediaQuery> sinkFloatingMediaQuery(MediaQuery*); void addNamespace(const AtomicString& prefix, const AtomicString& uri); @@ -221,7 +221,7 @@ namespace WebCore { CSSStyleSheet* m_styleSheet; RefPtr<CSSRule> m_rule; RefPtr<CSSRule> m_keyframe; - MediaQuery* m_mediaQuery; + OwnPtr<MediaQuery> m_mediaQuery; CSSParserValueList* m_valueList; CSSProperty** m_parsedProperties; CSSSelectorList* m_selectorListForParseSelector; @@ -301,9 +301,9 @@ namespace WebCore { HashSet<CSSParserValueList*> m_floatingValueLists; HashSet<CSSParserFunction*> m_floatingFunctions; - MediaQuery* m_floatingMediaQuery; - MediaQueryExp* m_floatingMediaQueryExp; - Vector<MediaQueryExp*>* m_floatingMediaQueryExpList; + OwnPtr<MediaQuery> m_floatingMediaQuery; + OwnPtr<MediaQueryExp> m_floatingMediaQueryExp; + OwnPtr<Vector<MediaQueryExp*> > m_floatingMediaQueryExpList; Vector<CSSSelector*> m_reusableSelectorVector; |