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

Side by Side Diff: Source/core/html/canvas/HitRegion.cpp

Issue 656723005: Use C++11 features in core/html (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: use nullptr Created 6 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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/html/canvas/HitRegion.h" 6 #include "core/html/canvas/HitRegion.h"
7 7
8 #include "core/accessibility/AXObjectCache.h" 8 #include "core/accessibility/AXObjectCache.h"
9 #include "core/rendering/RenderBoxModelObject.h" 9 #include "core/rendering/RenderBoxModelObject.h"
10 10
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 HitRegion* HitRegionManager::getHitRegionById(const String& id) const 127 HitRegion* HitRegionManager::getHitRegionById(const String& id) const
128 { 128 {
129 return m_hitRegionIdMap.get(id); 129 return m_hitRegionIdMap.get(id);
130 } 130 }
131 131
132 HitRegion* HitRegionManager::getHitRegionByControl(Element* control) const 132 HitRegion* HitRegionManager::getHitRegionByControl(Element* control) const
133 { 133 {
134 if (control) 134 if (control)
135 return m_hitRegionControlMap.get(control); 135 return m_hitRegionControlMap.get(control);
136 136
137 return 0; 137 return nullptr;
138 } 138 }
139 139
140 HitRegion* HitRegionManager::getHitRegionAtPoint(const LayoutPoint& point) const 140 HitRegion* HitRegionManager::getHitRegionAtPoint(const LayoutPoint& point) const
141 { 141 {
142 HitRegionIterator itEnd = m_hitRegionList.rend(); 142 HitRegionIterator itEnd = m_hitRegionList.rend();
143 143
144 for (HitRegionIterator it = m_hitRegionList.rbegin(); it != itEnd; ++it) { 144 for (HitRegionIterator it = m_hitRegionList.rbegin(); it != itEnd; ++it) {
145 RefPtrWillBeRawPtr<HitRegion> hitRegion = *it; 145 RefPtrWillBeRawPtr<HitRegion> hitRegion = *it;
146 if (hitRegion->contains(point)) 146 if (hitRegion->contains(point))
147 return hitRegion.get(); 147 return hitRegion.get();
148 } 148 }
149 149
150 return 0; 150 return nullptr;
151 } 151 }
152 152
153 unsigned HitRegionManager::getHitRegionsCount() const 153 unsigned HitRegionManager::getHitRegionsCount() const
154 { 154 {
155 return m_hitRegionList.size(); 155 return m_hitRegionList.size();
156 } 156 }
157 157
158 void HitRegionManager::trace(Visitor* visitor) 158 void HitRegionManager::trace(Visitor* visitor)
159 { 159 {
160 #if ENABLE(OILPAN) 160 #if ENABLE(OILPAN)
161 visitor->trace(m_hitRegionList); 161 visitor->trace(m_hitRegionList);
162 visitor->trace(m_hitRegionIdMap); 162 visitor->trace(m_hitRegionIdMap);
163 visitor->trace(m_hitRegionControlMap); 163 visitor->trace(m_hitRegionControlMap);
164 #endif 164 #endif
165 } 165 }
166 166
167 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(HitRegionManager) 167 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(HitRegionManager)
168 168
169 } // namespace blink 169 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698