Chromium Code Reviews| Index: Source/core/testing/Internals.cpp |
| diff --git a/Source/core/testing/Internals.cpp b/Source/core/testing/Internals.cpp |
| index bec4b9baa78bedbb41dda512e207244f8f78bead..b28336ecd5688c5a679f9c978ea4d3d0677cf654 100644 |
| --- a/Source/core/testing/Internals.cpp |
| +++ b/Source/core/testing/Internals.cpp |
| @@ -724,8 +724,8 @@ unsigned Internals::activeMarkerCountForNode(Node* node) |
| DocumentMarkerVector markers = node->document().markers().markersFor(node, markerType); |
| unsigned activeMarkerCount = 0; |
| - for (DocumentMarkerVector::iterator iter = markers.begin(); iter != markers.end(); ++iter) { |
| - if ((*iter)->activeMatch()) |
| + for (auto& marker : markers) { |
|
Julien - ping for review
2015/01/02 09:42:02
const auto&
zhaoze.zhou
2015/01/05 15:17:57
Done.
|
| + if (marker->activeMatch()) |
| activeMarkerCount++; |
| } |
| @@ -1152,8 +1152,8 @@ static unsigned eventHandlerCount(Document& document, EventHandlerRegistry::Even |
| unsigned count = 0; |
| const EventTargetSet* targets = registry->eventHandlerTargets(handlerClass); |
| if (targets) { |
| - for (EventTargetSet::const_iterator iter = targets->begin(); iter != targets->end(); ++iter) |
| - count += iter->value; |
| + for (const auto& target : *targets) |
| + count += target.value; |
| } |
| return count; |
| } |
| @@ -1682,9 +1682,8 @@ Vector<String> Internals::iconURLs(Document* document, int iconTypesMask) const |
| Vector<IconURL> iconURLs = document->iconURLs(iconTypesMask); |
| Vector<String> array; |
| - Vector<IconURL>::const_iterator iter(iconURLs.begin()); |
| - for (; iter != iconURLs.end(); ++iter) |
| - array.append(iter->m_iconURL.string()); |
| + for (auto& iconURL : iconURLs) |
| + array.append(iconURL.m_iconURL.string()); |
| return array; |
| } |
| @@ -2282,9 +2281,8 @@ String Internals::serializeNavigationMarkup() |
| frame()->document()->getTransitionElementData(elementData); |
| StringBuilder markup; |
| - Vector<Document::TransitionElementData>::iterator iter = elementData.begin(); |
| - for (; iter != elementData.end(); ++iter) |
| - markup.append(iter->markup); |
| + for (const auto& element : elementData) |
| + markup.append(element.markup); |
| return markup.toString(); |
| } |
| @@ -2325,9 +2323,8 @@ void Internals::hideAllTransitionElements() |
| Vector<Document::TransitionElementData> elementData; |
| frame()->document()->getTransitionElementData(elementData); |
| - Vector<Document::TransitionElementData>::iterator iter = elementData.begin(); |
| - for (; iter != elementData.end(); ++iter) |
| - frame()->document()->hideTransitionElements(AtomicString(iter->selector)); |
| + for (const auto& element : elementData) |
| + frame()->document()->hideTransitionElements(AtomicString(element.selector)); |
| } |
| void Internals::showAllTransitionElements() |
| @@ -2335,9 +2332,8 @@ void Internals::showAllTransitionElements() |
| Vector<Document::TransitionElementData> elementData; |
| frame()->document()->getTransitionElementData(elementData); |
| - Vector<Document::TransitionElementData>::iterator iter = elementData.begin(); |
| - for (; iter != elementData.end(); ++iter) |
| - frame()->document()->showTransitionElements(AtomicString(iter->selector)); |
| + for (const auto& element : elementData) |
| + frame()->document()->showTransitionElements(AtomicString(element.selector)); |
| } |
| void Internals::setExitTransitionStylesheetsEnabled(bool enabled) |