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

Side by Side Diff: Source/core/layout/OrderIterator.cpp

Issue 926193003: Move rendering/RenderBox to layout/LayoutBox. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/layout/OrderIterator.h ('k') | Source/core/layout/PaintInvalidationState.cpp » ('j') | 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) 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 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "core/layout/OrderIterator.h" 32 #include "core/layout/OrderIterator.h"
33 33
34 #include "core/rendering/RenderBox.h" 34 #include "core/layout/LayoutBox.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 OrderIterator::OrderIterator(const RenderBox* containerBox) 38 OrderIterator::OrderIterator(const LayoutBox* containerBox)
39 : m_containerBox(containerBox) 39 : m_containerBox(containerBox)
40 , m_currentChild(0) 40 , m_currentChild(0)
41 , m_isReset(false) 41 , m_isReset(false)
42 { 42 {
43 } 43 }
44 44
45 RenderBox* OrderIterator::first() 45 LayoutBox* OrderIterator::first()
46 { 46 {
47 reset(); 47 reset();
48 return next(); 48 return next();
49 } 49 }
50 50
51 RenderBox* OrderIterator::next() 51 LayoutBox* OrderIterator::next()
52 { 52 {
53 do { 53 do {
54 if (!m_currentChild) { 54 if (!m_currentChild) {
55 if (m_orderValuesIterator == m_orderValues.end()) 55 if (m_orderValuesIterator == m_orderValues.end())
56 return 0; 56 return 0;
57 57
58 if (!m_isReset) { 58 if (!m_isReset) {
59 ++m_orderValuesIterator; 59 ++m_orderValuesIterator;
60 if (m_orderValuesIterator == m_orderValues.end()) 60 if (m_orderValuesIterator == m_orderValues.end())
61 return 0; 61 return 0;
(...skipping 15 matching lines...) Expand all
77 m_currentChild = 0; 77 m_currentChild = 0;
78 m_orderValuesIterator = m_orderValues.begin(); 78 m_orderValuesIterator = m_orderValues.begin();
79 m_isReset = true; 79 m_isReset = true;
80 } 80 }
81 81
82 OrderIteratorPopulator::~OrderIteratorPopulator() 82 OrderIteratorPopulator::~OrderIteratorPopulator()
83 { 83 {
84 m_iterator.reset(); 84 m_iterator.reset();
85 } 85 }
86 86
87 void OrderIteratorPopulator::collectChild(const RenderBox* child) 87 void OrderIteratorPopulator::collectChild(const LayoutBox* child)
88 { 88 {
89 m_iterator.m_orderValues.insert(child->style()->order()); 89 m_iterator.m_orderValues.insert(child->style()->order());
90 } 90 }
91 91
92 } // namespace blink 92 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/OrderIterator.h ('k') | Source/core/layout/PaintInvalidationState.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698