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

Side by Side Diff: third_party/WebKit/Source/core/layout/OrderIterator.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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 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 "wtf/Allocator.h" 34 #include "wtf/Allocator.h"
35 #include "wtf/Noncopyable.h" 35 #include "wtf/Noncopyable.h"
36 36
37 #include <set> 37 #include <set>
38 38
39 namespace blink { 39 namespace blink {
40 40
41 class LayoutBox; 41 class LayoutBox;
42 42
43 class OrderIterator { 43 class OrderIterator {
44 DISALLOW_ALLOCATION(); 44 DISALLOW_NEW();
45 WTF_MAKE_NONCOPYABLE(OrderIterator); 45 WTF_MAKE_NONCOPYABLE(OrderIterator);
46 public: 46 public:
47 friend class OrderIteratorPopulator; 47 friend class OrderIteratorPopulator;
48 48
49 OrderIterator(const LayoutBox*); 49 OrderIterator(const LayoutBox*);
50 50
51 LayoutBox* currentChild() { return m_currentChild; } 51 LayoutBox* currentChild() { return m_currentChild; }
52 const LayoutBox* currentChild() const { return m_currentChild; } 52 const LayoutBox* currentChild() const { return m_currentChild; }
53 LayoutBox* first(); 53 LayoutBox* first();
54 const LayoutBox* first() const { return const_cast<OrderIterator*>(this)->fi rst(); } 54 const LayoutBox* first() const { return const_cast<OrderIterator*>(this)->fi rst(); }
(...skipping 26 matching lines...) Expand all
81 81
82 void collectChild(const LayoutBox*); 82 void collectChild(const LayoutBox*);
83 83
84 private: 84 private:
85 OrderIterator& m_iterator; 85 OrderIterator& m_iterator;
86 }; 86 };
87 87
88 } // namespace blink 88 } // namespace blink
89 89
90 #endif // OrderIterator_h 90 #endif // OrderIterator_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698