| OLD | NEW |
| 1 /* | 1 /* |
| 2 * CSS Media Query | 2 * CSS Media Query |
| 3 * | 3 * |
| 4 * Copyright (C) 2006 Kimmo Kinnunen <kimmo.t.kinnunen@nokia.com>. | 4 * Copyright (C) 2006 Kimmo Kinnunen <kimmo.t.kinnunen@nokia.com>. |
| 5 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). | 5 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). |
| 6 * | 6 * |
| 7 * Redistribution and use in source and binary forms, with or without | 7 * Redistribution and use in source and binary forms, with or without |
| 8 * modification, are permitted provided that the following conditions | 8 * modification, are permitted provided that the following conditions |
| 9 * are met: | 9 * are met: |
| 10 * 1. Redistributions of source code must retain the above copyright | 10 * 1. Redistributions of source code must retain the above copyright |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 23 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 23 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 24 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 24 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 26 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 26 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 27 */ | 27 */ |
| 28 | 28 |
| 29 #ifndef MediaQuery_h | 29 #ifndef MediaQuery_h |
| 30 #define MediaQuery_h | 30 #define MediaQuery_h |
| 31 | 31 |
| 32 #include "heap/Handle.h" |
| 32 #include "wtf/PassOwnPtr.h" | 33 #include "wtf/PassOwnPtr.h" |
| 33 #include "wtf/Vector.h" | 34 #include "wtf/Vector.h" |
| 34 #include "wtf/text/StringHash.h" | 35 #include "wtf/text/StringHash.h" |
| 35 #include "wtf/text/WTFString.h" | 36 #include "wtf/text/WTFString.h" |
| 36 | 37 |
| 37 namespace WebCore { | 38 namespace WebCore { |
| 38 class MediaQueryExp; | 39 class MediaQueryExp; |
| 39 | 40 |
| 40 typedef Vector<OwnPtr<MediaQueryExp> > ExpressionVector; | 41 typedef WillBeHeapVector<OwnPtrWillBeMember<MediaQueryExp> > ExpressionVector; |
| 41 | 42 |
| 42 class MediaQuery { | 43 class MediaQuery : public NoBaseWillBeGarbageCollectedFinalized<MediaQuery> { |
| 43 WTF_MAKE_FAST_ALLOCATED; | 44 DECLARE_GC_INFO; |
| 45 WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED; |
| 44 public: | 46 public: |
| 45 enum Restrictor { | 47 enum Restrictor { |
| 46 Only, Not, None | 48 Only, Not, None |
| 47 }; | 49 }; |
| 48 | 50 |
| 49 MediaQuery(Restrictor, const AtomicString& mediaType, PassOwnPtr<ExpressionV
ector> exprs); | 51 MediaQuery(Restrictor, const AtomicString& mediaType, PassOwnPtrWillBeRawPtr
<ExpressionVector> exprs); |
| 50 ~MediaQuery(); | 52 ~MediaQuery(); |
| 51 | 53 |
| 52 Restrictor restrictor() const { return m_restrictor; } | 54 Restrictor restrictor() const { return m_restrictor; } |
| 53 const ExpressionVector& expressions() const { return *m_expressions; } | 55 const ExpressionVector& expressions() const { return *m_expressions; } |
| 54 const AtomicString& mediaType() const { return m_mediaType; } | 56 const AtomicString& mediaType() const { return m_mediaType; } |
| 55 bool operator==(const MediaQuery& other) const; | 57 bool operator==(const MediaQuery& other) const; |
| 56 String cssText() const; | 58 String cssText() const; |
| 57 | 59 |
| 58 PassOwnPtr<MediaQuery> copy() const { return adoptPtr(new MediaQuery(*this))
; } | 60 PassOwnPtrWillBeRawPtr<MediaQuery> copy() const { return adoptPtrWillBeNoop(
new MediaQuery(*this)); } |
| 61 |
| 62 void trace(Visitor*); |
| 59 | 63 |
| 60 private: | 64 private: |
| 61 MediaQuery(const MediaQuery&); | 65 MediaQuery(const MediaQuery&); |
| 62 | 66 |
| 63 Restrictor m_restrictor; | 67 Restrictor m_restrictor; |
| 64 AtomicString m_mediaType; | 68 AtomicString m_mediaType; |
| 65 OwnPtr<ExpressionVector> m_expressions; | 69 OwnPtrWillBeMember<ExpressionVector> m_expressions; |
| 66 String m_serializationCache; | 70 String m_serializationCache; |
| 67 | 71 |
| 68 String serialize() const; | 72 String serialize() const; |
| 69 }; | 73 }; |
| 70 | 74 |
| 71 } // namespace | 75 } // namespace |
| 72 | 76 |
| 73 #endif | 77 #endif |
| OLD | NEW |