| Index: Source/core/inspector/DOMPatchSupport.cpp
|
| diff --git a/Source/core/inspector/DOMPatchSupport.cpp b/Source/core/inspector/DOMPatchSupport.cpp
|
| index e853b2fc6919aea1b499dee016d4c8eeec226cce..cc2d89df7407042e04489bf488ba358efb4a5bf9 100644
|
| --- a/Source/core/inspector/DOMPatchSupport.cpp
|
| +++ b/Source/core/inspector/DOMPatchSupport.cpp
|
| @@ -54,8 +54,6 @@
|
| #include "wtf/text/Base64.h"
|
| #include "wtf/text/CString.h"
|
|
|
| -using namespace std;
|
| -
|
| namespace WebCore {
|
|
|
| struct DOMPatchSupport::Digest {
|
| @@ -265,8 +263,8 @@ DOMPatchSupport::diff(const Vector<OwnPtr<Digest> >& oldList, const Vector<OwnPt
|
| if (oldIt == oldTable.end() || oldIt->value.size() != 1)
|
| continue;
|
|
|
| - newMap[newIt->value[0]] = make_pair(newList[newIt->value[0]].get(), oldIt->value[0]);
|
| - oldMap[oldIt->value[0]] = 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) {
|
| @@ -275,8 +273,8 @@ DOMPatchSupport::diff(const Vector<OwnPtr<Digest> >& oldList, const Vector<OwnPt
|
|
|
| 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] = make_pair(newList[i + 1].get(), j);
|
| - oldMap[j] = make_pair(oldList[j].get(), i + 1);
|
| + newMap[i + 1] = std::make_pair(newList[i + 1].get(), j);
|
| + oldMap[j] = std::make_pair(oldList[j].get(), i + 1);
|
| }
|
| }
|
|
|
| @@ -286,8 +284,8 @@ DOMPatchSupport::diff(const Vector<OwnPtr<Digest> >& oldList, const Vector<OwnPt
|
|
|
| size_t j = newMap[i].second - 1;
|
| if (!oldMap[j].first && newList[i - 1]->m_sha1 == oldList[j]->m_sha1) {
|
| - newMap[i - 1] = make_pair(newList[i - 1].get(), j);
|
| - oldMap[j] = make_pair(oldList[j].get(), i - 1);
|
| + newMap[i - 1] = std::make_pair(newList[i - 1].get(), j);
|
| + oldMap[j] = std::make_pair(oldList[j].get(), i - 1);
|
| }
|
| }
|
|
|
| @@ -296,7 +294,7 @@ DOMPatchSupport::diff(const Vector<OwnPtr<Digest> >& oldList, const Vector<OwnPt
|
| dumpMap(newMap, "NEW");
|
| #endif
|
|
|
| - return make_pair(oldMap, newMap);
|
| + return std::make_pair(oldMap, newMap);
|
| }
|
|
|
| bool DOMPatchSupport::innerPatchChildren(ContainerNode* parentNode, const Vector<OwnPtr<Digest> >& oldList, const Vector<OwnPtr<Digest> >& newList, ExceptionState& exceptionState)
|
|
|