Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(655)

Unified Diff: Source/core/css/MediaQuery.h

Issue 170283019: Change various helper classes to transition types to get CSSValue entirely onto the gc heap. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase and revert member to persistent in StorageEvent Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/css/MediaQuery.h
diff --git a/Source/core/css/MediaQuery.h b/Source/core/css/MediaQuery.h
index fa5463ee7dff79b5abdc0a394c4fb28645822606..02709d0f1de518c72aacbd2514203efe150e775a 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,32 +38,34 @@
namespace WebCore {
class MediaQueryExp;
-typedef Vector<OwnPtr<MediaQueryExp> > ExpressionVector;
+typedef WillBeHeapVector<OwnPtrWillBeMember<MediaQueryExp> > ExpressionHeapVector;
-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<ExpressionHeapVector> exprs);
~MediaQuery();
Restrictor restrictor() const { return m_restrictor; }
- const ExpressionVector& expressions() const { return *m_expressions; }
+ const ExpressionHeapVector& expressions() const { return *m_expressions; }
const AtomicString& mediaType() const { return m_mediaType; }
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<ExpressionHeapVector> m_expressions;
String m_serializationCache;
String serialize() const;

Powered by Google App Engine
This is Rietveld 408576698