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

Side by Side Diff: third_party/WebKit/Source/web/TextFinder.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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 82
83 void resetActiveMatch() { m_activeMatch = nullptr; } 83 void resetActiveMatch() { m_activeMatch = nullptr; }
84 84
85 int totalMatchCount() const { return m_totalMatchCount; } 85 int totalMatchCount() const { return m_totalMatchCount; }
86 bool scopingInProgress() const { return m_scopingInProgress; } 86 bool scopingInProgress() const { return m_scopingInProgress; }
87 void increaseMarkerVersion() { ++m_findMatchMarkersVersion; } 87 void increaseMarkerVersion() { ++m_findMatchMarkersVersion; }
88 88
89 ~TextFinder(); 89 ~TextFinder();
90 90
91 class FindMatch { 91 class FindMatch {
92 ALLOW_ONLY_INLINE_ALLOCATION(); 92 DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
93 public: 93 public:
94 FindMatch(PassRefPtrWillBeRawPtr<Range>, int ordinal); 94 FindMatch(PassRefPtrWillBeRawPtr<Range>, int ordinal);
95 95
96 DECLARE_TRACE(); 96 DECLARE_TRACE();
97 97
98 RefPtrWillBeMember<Range> m_range; 98 RefPtrWillBeMember<Range> m_range;
99 99
100 // 1-based index within this frame. 100 // 1-based index within this frame.
101 int m_ordinal; 101 int m_ordinal;
102 102
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 // Determines if the rects in the find-in-page matches cache of this frame 286 // Determines if the rects in the find-in-page matches cache of this frame
287 // are invalid and should be recomputed. 287 // are invalid and should be recomputed.
288 bool m_findMatchRectsAreValid; 288 bool m_findMatchRectsAreValid;
289 }; 289 };
290 290
291 } // namespace blink 291 } // namespace blink
292 292
293 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::TextFinder::FindMatch); 293 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::TextFinder::FindMatch);
294 294
295 #endif // TextFinder_h 295 #endif // TextFinder_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/heap/HeapTest.cpp ('k') | third_party/WebKit/Source/wtf/Allocator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698