Index: Source/web/WebDevToolsAgentImpl.cpp |
diff --git a/Source/web/WebDevToolsAgentImpl.cpp b/Source/web/WebDevToolsAgentImpl.cpp |
index 758f632575f848ab9878b63715a24ec3f801db6a..6a8ef9ec789252b97417bf341d717d446cbc630d 100644 |
--- a/Source/web/WebDevToolsAgentImpl.cpp |
+++ b/Source/web/WebDevToolsAgentImpl.cpp |
@@ -75,7 +75,6 @@ |
#include "wtf/text/WTFString.h" |
using namespace WebCore; |
-using namespace std; |
namespace OverlayZOrders { |
// Use 99 as a big z-order number so that highlight is above other overlays. |
@@ -454,13 +453,13 @@ void WebDevToolsAgentImpl::getAllocatedObjects(HashSet<const void*>& set) |
++m_totalObjectsCount; |
return true; |
} |
- size_t totalObjectsCount() const |
+ std::size_t totalObjectsCount() const |
{ |
return m_totalObjectsCount; |
} |
private: |
- size_t m_totalObjectsCount; |
+ std::size_t m_totalObjectsCount; |
}; |
CountingVisitor counter; |
@@ -468,7 +467,7 @@ void WebDevToolsAgentImpl::getAllocatedObjects(HashSet<const void*>& set) |
class PointerCollector : public WebDevToolsAgentClient::AllocatedObjectVisitor { |
public: |
- explicit PointerCollector(size_t maxObjectsCount) |
+ explicit PointerCollector(std::size_t maxObjectsCount) |
: m_maxObjectsCount(maxObjectsCount) |
, m_index(0) |
, m_success(true) |
@@ -493,20 +492,20 @@ void WebDevToolsAgentImpl::getAllocatedObjects(HashSet<const void*>& set) |
void copyTo(HashSet<const void*>& set) |
{ |
- for (size_t i = 0; i < m_index; i++) |
+ for (std::size_t i = 0; i < m_index; i++) |
set.add(m_pointers[i]); |
} |
private: |
- const size_t m_maxObjectsCount; |
- size_t m_index; |
+ const std::size_t m_maxObjectsCount; |
+ std::size_t m_index; |
bool m_success; |
const void** m_pointers; |
}; |
// Double size to allow room for all objects that may have been allocated |
// since we counted them. |
- size_t estimatedMaxObjectsCount = counter.totalObjectsCount() * 2; |
+ std::size_t estimatedMaxObjectsCount = counter.totalObjectsCount() * 2; |
while (true) { |
PointerCollector collector(estimatedMaxObjectsCount); |
m_client->visitAllocatedObjects(&collector); |
@@ -518,19 +517,19 @@ void WebDevToolsAgentImpl::getAllocatedObjects(HashSet<const void*>& set) |
} |
} |
-void WebDevToolsAgentImpl::dumpUncountedAllocatedObjects(const HashMap<const void*, size_t>& map) |
+void WebDevToolsAgentImpl::dumpUncountedAllocatedObjects(const HashMap<const void*, std::size_t>& map) |
{ |
class InstrumentedObjectSizeProvider : public WebDevToolsAgentClient::InstrumentedObjectSizeProvider { |
public: |
- InstrumentedObjectSizeProvider(const HashMap<const void*, size_t>& map) : m_map(map) { } |
- virtual size_t objectSize(const void* ptr) const |
+ InstrumentedObjectSizeProvider(const HashMap<const void*, std::size_t>& map) : m_map(map) { } |
+ virtual std::size_t objectSize(const void* ptr) const |
{ |
- HashMap<const void*, size_t>::const_iterator i = m_map.find(ptr); |
+ HashMap<const void*, std::size_t>::const_iterator i = m_map.find(ptr); |
return i == m_map.end() ? 0 : i->value; |
} |
private: |
- const HashMap<const void*, size_t>& m_map; |
+ const HashMap<const void*, std::size_t>& m_map; |
}; |
InstrumentedObjectSizeProvider provider(map); |
@@ -679,7 +678,7 @@ void WebDevToolsAgentImpl::flushPendingFrontendMessages() |
InspectorController* ic = inspectorController(); |
ic->flushPendingFrontendMessages(); |
- for (size_t i = 0; i < m_frontendMessageQueue.size(); ++i) |
+ for (std::size_t i = 0; i < m_frontendMessageQueue.size(); ++i) |
m_client->sendMessageToInspectorFrontend(m_frontendMessageQueue[i]->toJSONString()); |
m_frontendMessageQueue.clear(); |
} |