Chromium Code Reviews| Index: Source/core/css/MediaQuery.h |
| diff --git a/Source/core/css/MediaQuery.h b/Source/core/css/MediaQuery.h |
| index fa5463ee7dff79b5abdc0a394c4fb28645822606..250d369314c929c2a6f2a326c4240846063e4be3 100644 |
| --- a/Source/core/css/MediaQuery.h |
| +++ b/Source/core/css/MediaQuery.h |
| @@ -29,6 +29,7 @@ |
| #ifndef MediaQuery_h |
| #define MediaQuery_h |
| +#include "heap/Handle.h" |
| #include "wtf/PassOwnPtr.h" |
| #include "wtf/Vector.h" |
| #include "wtf/text/StringHash.h" |
| @@ -37,16 +38,16 @@ |
| namespace WebCore { |
| class MediaQueryExp; |
| -typedef Vector<OwnPtr<MediaQueryExp> > ExpressionVector; |
| +typedef WillBeHeapVector<OwnPtrWillBeMember<MediaQueryExp> > ExpressionVector; |
|
haraken
2014/03/03 10:51:30
Probably you might want to use "ExpressionHeapVect
wibling-chromium
2014/03/03 11:21:11
Done.
|
| -class MediaQuery { |
| - WTF_MAKE_FAST_ALLOCATED; |
| +class MediaQuery : public NoBaseWillBeGarbageCollectedFinalized<MediaQuery> { |
| + WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED; |
| public: |
| enum Restrictor { |
| Only, Not, None |
| }; |
| - MediaQuery(Restrictor, const AtomicString& mediaType, PassOwnPtr<ExpressionVector> exprs); |
| + MediaQuery(Restrictor, const AtomicString& mediaType, PassOwnPtrWillBeRawPtr<ExpressionVector> exprs); |
| ~MediaQuery(); |
| Restrictor restrictor() const { return m_restrictor; } |
| @@ -55,14 +56,16 @@ public: |
| bool operator==(const MediaQuery& other) const; |
| String cssText() const; |
| - PassOwnPtr<MediaQuery> copy() const { return adoptPtr(new MediaQuery(*this)); } |
| + PassOwnPtrWillBeRawPtr<MediaQuery> copy() const { return adoptPtrWillBeNoop(new MediaQuery(*this)); } |
| + |
| + void trace(Visitor*); |
| private: |
| MediaQuery(const MediaQuery&); |
| Restrictor m_restrictor; |
| AtomicString m_mediaType; |
| - OwnPtr<ExpressionVector> m_expressions; |
| + OwnPtrWillBeMember<ExpressionVector> m_expressions; |
| String m_serializationCache; |
| String serialize() const; |