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

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

Issue 1162383003: C++11: Replace 0 with nullptr where applicable in layout code. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add one more file. Created 5 years, 6 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
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 19 matching lines...) Expand all
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/layout/LayoutBox.h" 34 #include "core/layout/LayoutBox.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 OrderIterator::OrderIterator(const LayoutBox* containerBox) 38 OrderIterator::OrderIterator(const LayoutBox* containerBox)
39 : m_containerBox(containerBox) 39 : m_containerBox(containerBox)
40 , m_currentChild(0) 40 , m_currentChild(nullptr)
41 , m_isReset(false) 41 , m_isReset(false)
42 { 42 {
43 } 43 }
44 44
45 LayoutBox* OrderIterator::first() 45 LayoutBox* OrderIterator::first()
46 { 46 {
47 reset(); 47 reset();
48 return next(); 48 return next();
49 } 49 }
50 50
51 LayoutBox* 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 nullptr;
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 nullptr;
62 } else { 62 } else {
63 m_isReset = false; 63 m_isReset = false;
64 } 64 }
65 65
66 m_currentChild = m_containerBox->firstChildBox(); 66 m_currentChild = m_containerBox->firstChildBox();
67 } else { 67 } else {
68 m_currentChild = m_currentChild->nextSiblingBox(); 68 m_currentChild = m_currentChild->nextSiblingBox();
69 } 69 }
70 } while (!m_currentChild || m_currentChild->style()->order() != *m_orderValu esIterator); 70 } while (!m_currentChild || m_currentChild->style()->order() != *m_orderValu esIterator);
71 71
72 return m_currentChild; 72 return m_currentChild;
73 } 73 }
74 74
75 void OrderIterator::reset() 75 void OrderIterator::reset()
76 { 76 {
77 m_currentChild = 0; 77 m_currentChild = nullptr;
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 LayoutBox* 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/MultiColumnFragmentainerGroupTest.cpp ('k') | Source/core/layout/TableLayoutAlgorithmAuto.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698