| Index: Source/core/inspector/DOMPatchSupport.cpp
|
| diff --git a/Source/core/inspector/DOMPatchSupport.cpp b/Source/core/inspector/DOMPatchSupport.cpp
|
| index d1144fd76acb5e1152c94a03303e4512602e793b..bb44fed058711e18d138142fc1924b787e790b88 100644
|
| --- a/Source/core/inspector/DOMPatchSupport.cpp
|
| +++ b/Source/core/inspector/DOMPatchSupport.cpp
|
| @@ -63,7 +63,7 @@ struct DOMPatchSupport::Digest {
|
| String m_sha1;
|
| String m_attrsSHA1;
|
| Node* m_node;
|
| - Vector<OwnPtr<Digest> > m_children;
|
| + Vector<OwnPtr<Digest>> m_children;
|
| };
|
|
|
| void DOMPatchSupport::patchDocument(Document& document, const String& markup)
|
| @@ -141,13 +141,13 @@ Node* DOMPatchSupport::patchNode(Node* node, const String& markup, ExceptionStat
|
|
|
| // Compose the old list.
|
| ContainerNode* parentNode = node->parentNode();
|
| - Vector<OwnPtr<Digest> > oldList;
|
| + Vector<OwnPtr<Digest>> oldList;
|
| for (Node* child = parentNode->firstChild(); child; child = child->nextSibling())
|
| oldList.append(createDigest(child, 0));
|
|
|
| // Compose the new list.
|
| String markupCopy = markup.lower();
|
| - Vector<OwnPtr<Digest> > newList;
|
| + Vector<OwnPtr<Digest>> newList;
|
| for (Node* child = parentNode->firstChild(); child != node; child = child->nextSibling())
|
| newList.append(createDigest(child, 0));
|
| for (Node* child = fragment->firstChild(); child; child = child->nextSibling()) {
|
| @@ -211,7 +211,7 @@ bool DOMPatchSupport::innerPatchNode(Digest* oldDigest, Digest* newDigest, Excep
|
| }
|
|
|
| pair<DOMPatchSupport::ResultMap, DOMPatchSupport::ResultMap>
|
| -DOMPatchSupport::diff(const Vector<OwnPtr<Digest> >& oldList, const Vector<OwnPtr<Digest> >& newList)
|
| +DOMPatchSupport::diff(const Vector<OwnPtr<Digest>>& oldList, const Vector<OwnPtr<Digest>>& newList)
|
| {
|
| ResultMap newMap(newList.size());
|
| ResultMap oldMap(oldList.size());
|
| @@ -242,7 +242,7 @@ DOMPatchSupport::diff(const Vector<OwnPtr<Digest> >& oldList, const Vector<OwnPt
|
| newMap[newIndex].second = oldIndex;
|
| }
|
|
|
| - typedef HashMap<String, Vector<size_t> > DiffTable;
|
| + typedef HashMap<String, Vector<size_t>> DiffTable;
|
| DiffTable newTable;
|
| DiffTable oldTable;
|
|
|
| @@ -296,7 +296,7 @@ DOMPatchSupport::diff(const Vector<OwnPtr<Digest> >& oldList, const Vector<OwnPt
|
| return std::make_pair(oldMap, newMap);
|
| }
|
|
|
| -bool DOMPatchSupport::innerPatchChildren(ContainerNode* parentNode, const Vector<OwnPtr<Digest> >& oldList, const Vector<OwnPtr<Digest> >& newList, ExceptionState& exceptionState)
|
| +bool DOMPatchSupport::innerPatchChildren(ContainerNode* parentNode, const Vector<OwnPtr<Digest>>& oldList, const Vector<OwnPtr<Digest>>& newList, ExceptionState& exceptionState)
|
| {
|
| pair<ResultMap, ResultMap> resultMaps = diff(oldList, newList);
|
| ResultMap& oldMap = resultMaps.first;
|
| @@ -307,7 +307,7 @@ bool DOMPatchSupport::innerPatchChildren(ContainerNode* parentNode, const Vector
|
|
|
| // 1. First strip everything except for the nodes that retain. Collect pending merges.
|
| HashMap<Digest*, Digest*> merges;
|
| - HashSet<size_t, WTF::IntHash<size_t>, WTF::UnsignedWithZeroKeyHashTraits<size_t> > usedNewOrdinals;
|
| + HashSet<size_t, WTF::IntHash<size_t>, WTF::UnsignedWithZeroKeyHashTraits<size_t>> usedNewOrdinals;
|
| for (size_t i = 0; i < oldList.size(); ++i) {
|
| if (oldMap[i].first) {
|
| if (usedNewOrdinals.add(oldMap[i].second).isNewEntry)
|
| @@ -344,7 +344,7 @@ bool DOMPatchSupport::innerPatchChildren(ContainerNode* parentNode, const Vector
|
| }
|
|
|
| // Mark retained nodes as used, do not reuse node more than once.
|
| - HashSet<size_t, WTF::IntHash<size_t>, WTF::UnsignedWithZeroKeyHashTraits<size_t> > usedOldOrdinals;
|
| + HashSet<size_t, WTF::IntHash<size_t>, WTF::UnsignedWithZeroKeyHashTraits<size_t>> usedOldOrdinals;
|
| for (size_t i = 0; i < newList.size(); ++i) {
|
| if (!newMap[i].first)
|
| continue;
|
|
|