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

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

Issue 1406923009: Rename DISALLOW_ALLOCATION and ALLOW_ONLY_INLINE_ALLOCATION (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 * Copyright (c) 2010 Google Inc. All rights reserved. 2 * Copyright (c) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 23 matching lines...) Expand all
34 #include "core/css/StyleRule.h" 34 #include "core/css/StyleRule.h"
35 #include "platform/heap/Handle.h" 35 #include "platform/heap/Handle.h"
36 #include "wtf/Forward.h" 36 #include "wtf/Forward.h"
37 #include "wtf/RefCounted.h" 37 #include "wtf/RefCounted.h"
38 #include "wtf/Vector.h" 38 #include "wtf/Vector.h"
39 #include "wtf/text/WTFString.h" 39 #include "wtf/text/WTFString.h"
40 40
41 namespace blink { 41 namespace blink {
42 42
43 struct SourceRange { 43 struct SourceRange {
44 ALLOW_ONLY_INLINE_ALLOCATION(); 44 DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
45 public: 45 public:
46 SourceRange(); 46 SourceRange();
47 SourceRange(unsigned start, unsigned end); 47 SourceRange(unsigned start, unsigned end);
48 unsigned length() const; 48 unsigned length() const;
49 49
50 DEFINE_INLINE_TRACE() { } 50 DEFINE_INLINE_TRACE() { }
51 51
52 unsigned start; 52 unsigned start;
53 unsigned end; 53 unsigned end;
54 }; 54 };
55 55
56 struct CSSPropertySourceData { 56 struct CSSPropertySourceData {
57 ALLOW_ONLY_INLINE_ALLOCATION(); 57 DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
58 public: 58 public:
59 CSSPropertySourceData(const String& name, const String& value, bool importan t, bool disabled, bool parsedOk, const SourceRange& range); 59 CSSPropertySourceData(const String& name, const String& value, bool importan t, bool disabled, bool parsedOk, const SourceRange& range);
60 CSSPropertySourceData(const CSSPropertySourceData& other); 60 CSSPropertySourceData(const CSSPropertySourceData& other);
61 61
62 DEFINE_INLINE_TRACE() { visitor->trace(range); } 62 DEFINE_INLINE_TRACE() { visitor->trace(range); }
63 63
64 String name; 64 String name;
65 String value; 65 String value;
66 bool important; 66 bool important;
67 bool disabled; 67 bool disabled;
(...skipping 11 matching lines...) Expand all
79 { 79 {
80 #if ENABLE(OILPAN) 80 #if ENABLE(OILPAN)
81 visitor->trace(propertyData); 81 visitor->trace(propertyData);
82 #endif 82 #endif
83 } 83 }
84 84
85 WillBeHeapVector<CSSPropertySourceData> propertyData; 85 WillBeHeapVector<CSSPropertySourceData> propertyData;
86 }; 86 };
87 87
88 struct CSSMediaQueryExpSourceData { 88 struct CSSMediaQueryExpSourceData {
89 ALLOW_ONLY_INLINE_ALLOCATION(); 89 DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
90 public: 90 public:
91 CSSMediaQueryExpSourceData(const SourceRange& valueRange) 91 CSSMediaQueryExpSourceData(const SourceRange& valueRange)
92 : valueRange(valueRange) { } 92 : valueRange(valueRange) { }
93 93
94 DEFINE_INLINE_TRACE() { visitor->trace(valueRange); } 94 DEFINE_INLINE_TRACE() { visitor->trace(valueRange); }
95 95
96 SourceRange valueRange; 96 SourceRange valueRange;
97 }; 97 };
98 98
99 struct CSSMediaQuerySourceData : public RefCountedWillBeGarbageCollected<CSSMedi aQuerySourceData> { 99 struct CSSMediaQuerySourceData : public RefCountedWillBeGarbageCollected<CSSMedi aQuerySourceData> {
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 RefPtrWillBeMember<CSSMediaSourceData> mediaSourceData; 170 RefPtrWillBeMember<CSSMediaSourceData> mediaSourceData;
171 }; 171 };
172 172
173 } // namespace blink 173 } // namespace blink
174 174
175 WTF_ALLOW_MOVE_AND_INIT_WITH_MEM_FUNCTIONS(blink::SourceRange); 175 WTF_ALLOW_MOVE_AND_INIT_WITH_MEM_FUNCTIONS(blink::SourceRange);
176 WTF_ALLOW_MOVE_AND_INIT_WITH_MEM_FUNCTIONS(blink::CSSPropertySourceData); 176 WTF_ALLOW_MOVE_AND_INIT_WITH_MEM_FUNCTIONS(blink::CSSPropertySourceData);
177 WTF_ALLOW_MOVE_AND_INIT_WITH_MEM_FUNCTIONS(blink::CSSMediaQueryExpSourceData); 177 WTF_ALLOW_MOVE_AND_INIT_WITH_MEM_FUNCTIONS(blink::CSSMediaQueryExpSourceData);
178 178
179 #endif // CSSPropertySourceData_h 179 #endif // CSSPropertySourceData_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSProperty.h ('k') | third_party/WebKit/Source/core/css/CSSToLengthConversionData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698