diff options
| author | Iain Merrick <husky@google.com> | 2010-09-13 16:35:48 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-09-16 12:10:42 +0100 |
| commit | 5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306 (patch) | |
| tree | ddce1aa5e3b6967a69691892e500897558ff8ab6 /WebCore/css/MediaQuery.h | |
| parent | 12bec63ec71e46baba27f0bd9bd9d8067683690a (diff) | |
| download | external_webkit-5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306.zip external_webkit-5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306.tar.gz external_webkit-5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306.tar.bz2 | |
Merge WebKit at r67178 : Initial merge by git.
Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
Diffstat (limited to 'WebCore/css/MediaQuery.h')
| -rw-r--r-- | WebCore/css/MediaQuery.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/css/MediaQuery.h b/WebCore/css/MediaQuery.h index 3eea3b2..281009b 100644 --- a/WebCore/css/MediaQuery.h +++ b/WebCore/css/MediaQuery.h @@ -43,11 +43,11 @@ public: Only, Not, None }; - MediaQuery(Restrictor, const String& mediaType, PassOwnPtr<Vector<MediaQueryExp*> > exprs); + MediaQuery(Restrictor, const String& mediaType, PassOwnPtr<Vector<OwnPtr<MediaQueryExp> > > exprs); ~MediaQuery(); Restrictor restrictor() const { return m_restrictor; } - const Vector<MediaQueryExp*>* expressions() const { return m_expressions.get(); } + const Vector<OwnPtr<MediaQueryExp> >* expressions() const { return m_expressions.get(); } String mediaType() const { return m_mediaType; } bool operator==(const MediaQuery& other) const; String cssText() const; @@ -56,7 +56,7 @@ public: private: Restrictor m_restrictor; String m_mediaType; - OwnPtr<Vector<MediaQueryExp*> > m_expressions; + OwnPtr<Vector<OwnPtr<MediaQueryExp> > > m_expressions; bool m_ignored; String m_serializationCache; |