Use C++11 range-based for loop in Source/core/inspector

Source/core/inspector/DOMPatchSupport.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 182 matching lines @@
     if (oldDigest->m_attrsSHA1 != newDigest->m_attrsSHA1) {
         // FIXME: Create a function in Element for removing all properties. Take in account whether did/willModifyAttribute are important.
         while (oldElement->attributesWithoutUpdate().size()) {
             const Attribute& attribute = oldElement->attributesWithoutUpdate().at(0);
             if (!m_domEditor->removeAttribute(oldElement, attribute.localName(), exceptionState))
                 return false;
         }
 
         // FIXME: Create a function in Element for copying properties. cloneDataFromElement() is close but not enough for this case.
         AttributeCollection attributes = newElement->attributesWithoutUpdate();
-        AttributeCollection::iterator end = attributes.end();
-        for (AttributeCollection::iterator it = attributes.begin(); it != end; ++it) {
-            if (!m_domEditor->setAttribute(oldElement, it->name().localName(), it->value(), exceptionState))
+        for (auto it : attributes) {

[pfeldman, 2014/12/16 16:52:10]

Here and below: are you creating copies here?

[zhaoze.zhou, 2014/12/16 18:56:39]

Done.

+            if (!m_domEditor->setAttribute(oldElement, it.name().localName(), it.value(), exceptionState))
                 return false;
         }
     }
 
     bool result = innerPatchChildren(oldElement, oldDigest->m_children, newDigest->m_children, exceptionState);
     m_unusedNodesMap.remove(newDigest->m_sha1);
     return result;
 }
 
 pair<DOMPatchSupport::ResultMap, DOMPatchSupport::ResultMap>
@@ skipping 33 matching lines @@
     DiffTable oldTable;
 
     for (size_t i = 0; i < newList.size(); ++i) {
         newTable.add(newList[i]->m_sha1, Vector<size_t>()).storedValue->value.append(i);
     }
 
     for (size_t i = 0; i < oldList.size(); ++i) {
         oldTable.add(oldList[i]->m_sha1, Vector<size_t>()).storedValue->value.append(i);
     }
 
-    for (DiffTable::iterator newIt = newTable.begin(); newIt != newTable.end(); ++newIt) {
-        if (newIt->value.size() != 1)
+    for (auto newIt : newTable) {
+        if (newIt.value.size() != 1)
             continue;
 
-        DiffTable::iterator oldIt = oldTable.find(newIt->key);
+        DiffTable::iterator oldIt = oldTable.find(newIt.key);
         if (oldIt == oldTable.end() || oldIt->value.size() != 1)
             continue;
 
-        newMap[newIt->value[0]] = std::make_pair(newList[newIt->value[0]].get(), oldIt->value[0]);
-        oldMap[oldIt->value[0]] = std::make_pair(oldList[oldIt->value[0]].get(), newIt->value[0]);
+        newMap[newIt.value[0]] = std::make_pair(newList[newIt.value[0]].get(), oldIt->value[0]);
+        oldMap[oldIt->value[0]] = std::make_pair(oldList[oldIt->value[0]].get(), newIt.value[0]);
     }
 
     for (size_t i = 0; newList.size() > 0 && i < newList.size() - 1; ++i) {
         if (!newMap[i].first || newMap[i + 1].first)
             continue;
 
         size_t j = newMap[i].second + 1;
         if (j < oldMap.size() && !oldMap[j].first && newList[i + 1]->m_sha1 == oldList[j]->m_sha1) {
             newMap[i + 1] = std::make_pair(newList[i + 1].get(), j);
             oldMap[j] = std::make_pair(oldList[j].get(), i + 1);
@@ skipping 86 matching lines @@
     if (oldHead || oldBody) {
         for (size_t i = 0; i < newList.size(); ++i) {
             if (oldHead && isHTMLHeadElement(*newList[i]->m_node))
                 merges.set(newList[i].get(), oldHead);
             if (oldBody && isHTMLBodyElement(*newList[i]->m_node))
                 merges.set(newList[i].get(), oldBody);
         }
     }
 
     // 2. Patch nodes marked for merge.
-    for (HashMap<Digest*, Digest*>::iterator it = merges.begin(); it != merges.end(); ++it) {
-        if (!innerPatchNode(it->value, it->key, exceptionState))
+    for (auto it : merges) {
+        if (!innerPatchNode(it.value, it.key, exceptionState))
             return false;
     }
 
     // 3. Insert missing nodes.
     for (size_t i = 0; i < newMap.size(); ++i) {
         if (newMap[i].first || merges.contains(newList[i].get()))
             continue;
         if (!insertBeforeAndMarkAsUsed(parentNode, newList[i].get(), NodeTraversal::childAt(*parentNode, i), exceptionState))
             return false;
     }
@@ skipping 38 matching lines @@
         while (child) {
             OwnPtr<Digest> childInfo = createDigest(child, unusedNodesMap);
             addStringToDigestor(digestor.get(), childInfo->m_sha1);
             child = child->nextSibling();
             digest->m_children.append(childInfo.release());
         }
 
         AttributeCollection attributes = element.attributesWithoutUpdate();
         if (!attributes.isEmpty()) {
             OwnPtr<blink::WebCryptoDigestor> attrsDigestor = createDigestor(HashAlgorithmSha1);
-            AttributeCollection::iterator end = attributes.end();
-            for (AttributeCollection::iterator it = attributes.begin(); it != end; ++it) {
-                addStringToDigestor(attrsDigestor.get(), it->name().toString());
-                addStringToDigestor(attrsDigestor.get(), it->value().string());
+            for (auto it : attributes) {
+                addStringToDigestor(attrsDigestor.get(), it.name().toString());
+                addStringToDigestor(attrsDigestor.get(), it.value().string());
             }
             finishDigestor(attrsDigestor.get(), digestResult);
             digest->m_attrsSHA1 = base64Encode(reinterpret_cast<const char*>(digestResult.data()), 10);
             addStringToDigestor(digestor.get(), digest->m_attrsSHA1);
             digestResult.clear();
         }
     }
     finishDigestor(digestor.get(), digestResult);
     digest->m_sha1 = base64Encode(reinterpret_cast<const char*>(digestResult.data()), 10);
 
@@ skipping 61 matching lines @@
 void DOMPatchSupport::dumpMap(const ResultMap& map, const String& name)
 {
     fprintf(stderr, "\n\n");
     for (size_t i = 0; i < map.size(); ++i)
         fprintf(stderr, "%s[%lu]: %s (%p) - [%lu]\n", name.utf8().data(), i, map[i].first ? nodeName(map[i].first->m_node).utf8().data() : "", map[i].first, map[i].second);
 }
 #endif
 
 } // namespace blink