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

Side by Side Diff: Source/core/xml/XPathNodeSet.cpp

Issue 781673002: Use C++11 range-based loop for core/xml and core/loader (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: remove unnecessary curly brackets Created 5 years, 11 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
« no previous file with comments | « Source/core/loader/ImageLoader.cpp ('k') | Source/core/xml/XPathParser.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) 2007 Alexey Proskuryakov <ap@webkit.org> 2 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 228
229 for (Node& n : NodeTraversal::startsAt(findRootNode(m_nodes.first().get()))) { 229 for (Node& n : NodeTraversal::startsAt(findRootNode(m_nodes.first().get()))) {
230 if (nodes.contains(&n)) 230 if (nodes.contains(&n))
231 sortedNodes.append(&n); 231 sortedNodes.append(&n);
232 232
233 if (!containsAttributeNodes || !n.isElementNode()) 233 if (!containsAttributeNodes || !n.isElementNode())
234 continue; 234 continue;
235 235
236 Element* element = toElement(&n); 236 Element* element = toElement(&n);
237 AttributeCollection attributes = element->attributes(); 237 AttributeCollection attributes = element->attributes();
238 AttributeCollection::iterator end = attributes.end(); 238 for (auto& attribute : attributes) {
239 for (AttributeCollection::iterator it = attributes.begin(); it != end; + +it) { 239 RefPtrWillBeRawPtr<Attr> attr = element->attrIfExists(attribute.name ());
240 RefPtrWillBeRawPtr<Attr> attr = element->attrIfExists(it->name());
241 if (attr && nodes.contains(attr.get())) 240 if (attr && nodes.contains(attr.get()))
242 sortedNodes.append(attr); 241 sortedNodes.append(attr);
243 } 242 }
244 } 243 }
245 244
246 ASSERT(sortedNodes.size() == nodeCount); 245 ASSERT(sortedNodes.size() == nodeCount);
247 const_cast<WillBeHeapVector<RefPtrWillBeMember<Node> >&>(m_nodes).swap(sorte dNodes); 246 const_cast<WillBeHeapVector<RefPtrWillBeMember<Node> >&>(m_nodes).swap(sorte dNodes);
248 } 247 }
249 248
250 void NodeSet::reverse() 249 void NodeSet::reverse()
(...skipping 24 matching lines...) Expand all
275 Node* NodeSet::anyNode() const 274 Node* NodeSet::anyNode() const
276 { 275 {
277 if (isEmpty()) 276 if (isEmpty())
278 return 0; 277 return 0;
279 278
280 return m_nodes.at(0).get(); 279 return m_nodes.at(0).get();
281 } 280 }
282 281
283 } 282 }
284 } 283 }
OLDNEW
« no previous file with comments | « Source/core/loader/ImageLoader.cpp ('k') | Source/core/xml/XPathParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698