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

Side by Side Diff: third_party/WebKit/Source/core/css/MediaQuery.h

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 unified diff | Download patch
OLDNEW
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 22 matching lines...) Expand all
33 #include "platform/heap/Handle.h" 33 #include "platform/heap/Handle.h"
34 #include "wtf/PassOwnPtr.h" 34 #include "wtf/PassOwnPtr.h"
35 #include "wtf/Vector.h" 35 #include "wtf/Vector.h"
36 #include "wtf/text/StringHash.h" 36 #include "wtf/text/StringHash.h"
37 #include "wtf/text/WTFString.h" 37 #include "wtf/text/WTFString.h"
38 #include <utility> 38 #include <utility>
39 39
40 namespace blink { 40 namespace blink {
41 class MediaQueryExp; 41 class MediaQueryExp;
42 42
43 using ExpressionHeapVector = WillBeHeapVector<OwnPtrWillBeMember<MediaQueryExp>> ; 43 using ExpressionHeapVector = HeapVector<Member<MediaQueryExp>>;
44 44
45 class CORE_EXPORT MediaQuery : public NoBaseWillBeGarbageCollectedFinalized<Medi aQuery> { 45 class CORE_EXPORT MediaQuery : public GarbageCollectedFinalized<MediaQuery> {
46 USING_FAST_MALLOC_WILL_BE_REMOVED(MediaQuery);
47 public: 46 public:
48 enum RestrictorType { 47 enum RestrictorType {
49 Only, Not, None 48 Only, Not, None
50 }; 49 };
51 50
52 static PassOwnPtrWillBeRawPtr<MediaQuery> create(RestrictorType, String medi aType, ExpressionHeapVector); 51 static RawPtr<MediaQuery> create(RestrictorType, String mediaType, Expressio nHeapVector);
53 static PassOwnPtrWillBeRawPtr<MediaQuery> createNotAll(); 52 static RawPtr<MediaQuery> createNotAll();
54 53
55 ~MediaQuery(); 54 ~MediaQuery();
56 55
57 RestrictorType restrictor() const { return m_restrictor; } 56 RestrictorType restrictor() const { return m_restrictor; }
58 const ExpressionHeapVector& expressions() const { return m_expressions; } 57 const ExpressionHeapVector& expressions() const { return m_expressions; }
59 const String& mediaType() const { return m_mediaType; } 58 const String& mediaType() const { return m_mediaType; }
60 bool operator==(const MediaQuery& other) const; 59 bool operator==(const MediaQuery& other) const;
61 String cssText() const; 60 String cssText() const;
62 61
63 PassOwnPtrWillBeRawPtr<MediaQuery> copy() const { return adoptPtrWillBeNoop( new MediaQuery(*this)); } 62 RawPtr<MediaQuery> copy() const { return new MediaQuery(*this); }
64 63
65 DECLARE_TRACE(); 64 DECLARE_TRACE();
66 65
67 private: 66 private:
68 MediaQuery(RestrictorType, String mediaType, ExpressionHeapVector); 67 MediaQuery(RestrictorType, String mediaType, ExpressionHeapVector);
69 MediaQuery(const MediaQuery&); 68 MediaQuery(const MediaQuery&);
70 69
71 MediaQuery& operator=(const MediaQuery&) = delete; 70 MediaQuery& operator=(const MediaQuery&) = delete;
72 71
73 RestrictorType m_restrictor; 72 RestrictorType m_restrictor;
74 String m_mediaType; 73 String m_mediaType;
75 ExpressionHeapVector m_expressions; 74 ExpressionHeapVector m_expressions;
76 String m_serializationCache; 75 String m_serializationCache;
77 76
78 String serialize() const; 77 String serialize() const;
79 }; 78 };
80 79
81 } // namespace blink 80 } // namespace blink
82 81
83 #endif 82 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/MediaList.idl ('k') | third_party/WebKit/Source/core/css/MediaQuery.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698