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

Side by Side Diff: third_party/WebKit/Source/wtf/RefCounted.h

Issue 2714703002: Avoid needless InstanceCounter.h inclusion. (Closed)
Patch Set: Created 3 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Library General Public License for more details. 12 * Library General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU Library General Public License 14 * You should have received a copy of the GNU Library General Public License
15 * along with this library; see the file COPYING.LIB. If not, write to 15 * along with this library; see the file COPYING.LIB. If not, write to
16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
17 * Boston, MA 02110-1301, USA. 17 * Boston, MA 02110-1301, USA.
18 * 18 *
19 */ 19 */
20 20
21 #ifndef RefCounted_h 21 #ifndef RefCounted_h
22 #define RefCounted_h 22 #define RefCounted_h
23 23
24 #include "wtf/Allocator.h" 24 #include "wtf/Allocator.h"
25 #include "wtf/Assertions.h" 25 #include "wtf/Assertions.h"
26 #include "wtf/InstanceCounter.h"
27 #include "wtf/Noncopyable.h" 26 #include "wtf/Noncopyable.h"
28 #include "wtf/WTFExport.h" 27 #include "wtf/WTFExport.h"
29 28
29 #if ENABLE(INSTANCE_COUNTER)
30 #include "wtf/InstanceCounter.h"
31 #endif
32
30 #if DCHECK_IS_ON() 33 #if DCHECK_IS_ON()
31 #define CHECK_REF_COUNTED_LIFECYCLE 1 34 #define CHECK_REF_COUNTED_LIFECYCLE 1
32 #include "wtf/ThreadRestrictionVerifier.h" 35 #include "wtf/ThreadRestrictionVerifier.h"
33 #else 36 #else
34 #define CHECK_REF_COUNTED_LIFECYCLE 0 37 #define CHECK_REF_COUNTED_LIFECYCLE 0
35 #endif 38 #endif
36 39
37 namespace WTF { 40 namespace WTF {
38 41
39 // This base class holds the non-template methods and attributes. 42 // This base class holds the non-template methods and attributes.
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 // new. 148 // new.
146 USING_FAST_MALLOC(T); 149 USING_FAST_MALLOC(T);
147 150
148 public: 151 public:
149 void deref() const { 152 void deref() const {
150 if (derefBase()) 153 if (derefBase())
151 delete static_cast<const T*>(this); 154 delete static_cast<const T*>(this);
152 } 155 }
153 156
154 protected: 157 protected:
155 #ifdef ENABLE_INSTANCE_COUNTER 158 #if ENABLE(INSTANCE_COUNTER)
156 RefCounted() { incrementInstanceCount<T>(static_cast<T*>(this)); } 159 RefCounted() { incrementInstanceCount<T>(static_cast<T*>(this)); }
157 160
158 ~RefCounted() { decrementInstanceCount<T>(static_cast<T*>(this)); } 161 ~RefCounted() { decrementInstanceCount<T>(static_cast<T*>(this)); }
159 #else 162 #else
160 RefCounted() {} 163 RefCounted() {}
161 #endif 164 #endif
162 }; 165 };
163 166
164 } // namespace WTF 167 } // namespace WTF
165 168
166 using WTF::RefCounted; 169 using WTF::RefCounted;
167 170
168 #endif // RefCounted_h 171 #endif // RefCounted_h
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698