OLD | NEW |
---|---|
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 20 matching lines...) Expand all Loading... | |
31 #ifndef OrderIterator_h | 31 #ifndef OrderIterator_h |
32 #define OrderIterator_h | 32 #define OrderIterator_h |
33 | 33 |
34 #include "wtf/Noncopyable.h" | 34 #include "wtf/Noncopyable.h" |
35 #include "wtf/Vector.h" | 35 #include "wtf/Vector.h" |
36 | 36 |
37 namespace WebCore { | 37 namespace WebCore { |
38 | 38 |
39 class RenderBox; | 39 class RenderBox; |
40 class RenderFlexibleBox; | 40 class RenderFlexibleBox; |
41 class RenderGrid; | |
41 | 42 |
42 class OrderIterator { | 43 class OrderIterator { |
43 WTF_MAKE_NONCOPYABLE(OrderIterator); | 44 WTF_MAKE_NONCOPYABLE(OrderIterator); |
44 public: | 45 public: |
45 OrderIterator(const RenderFlexibleBox*); | 46 OrderIterator(const RenderFlexibleBox*); |
47 OrderIterator(const RenderGrid*); | |
ojan
2013/07/03 20:21:57
Lets just have it take a const RenderBox* instead
Julien - ping for review
2013/07/03 21:38:16
Done.
| |
48 | |
46 void setOrderValues(Vector<int>&); | 49 void setOrderValues(Vector<int>&); |
47 RenderBox* currentChild() const { return m_currentChild; } | 50 RenderBox* currentChild() const { return m_currentChild; } |
48 RenderBox* first(); | 51 RenderBox* first(); |
49 RenderBox* next(); | 52 RenderBox* next(); |
50 void reset(); | 53 void reset(); |
51 | 54 |
52 private: | 55 private: |
53 const RenderFlexibleBox* m_flexibleBox; | 56 const RenderBox* m_containerBox; |
54 RenderBox* m_currentChild; | 57 RenderBox* m_currentChild; |
55 Vector<int> m_orderValues; | 58 Vector<int> m_orderValues; |
56 Vector<int>::const_iterator m_orderValuesIterator; | 59 Vector<int>::const_iterator m_orderValuesIterator; |
57 }; | 60 }; |
58 | 61 |
59 } // namespace WebCore | 62 } // namespace WebCore |
60 | 63 |
61 #endif // OrderIterator_h | 64 #endif // OrderIterator_h |
OLD | NEW |