Changeset 142795 in webkit
- Timestamp:
- Feb 13, 2013 2:02:51 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 1 deleted
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r142793 r142795 1 2013-02-13 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r142747. 4 http://trac.webkit.org/changeset/142747 5 https://bugs.webkit.org/show_bug.cgi?id=109746 6 7 broke component build (Requested by alecf_gardening on 8 #webkit). 9 10 * inspector/HeapGraphSerializer.cpp: 11 (WebCore::HeapGraphSerializer::HeapGraphSerializer): 12 (WebCore::HeapGraphSerializer::pushUpdate): 13 (WebCore::HeapGraphSerializer::reportNode): 14 (WebCore::HeapGraphSerializer::toNodeId): 15 (WebCore::HeapGraphSerializer::addRootNode): 16 * inspector/HeapGraphSerializer.h: 17 (WebCore): 18 (HeapGraphSerializer): 19 * inspector/InspectorMemoryAgent.cpp: 20 (WebCore::InspectorMemoryAgent::getProcessMemoryDistributionImpl): 21 1 22 2013-02-13 Levi Weintraub <leviw@chromium.org> 2 23 -
trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp
r142747 r142795 44 44 namespace WebCore { 45 45 46 HeapGraphSerializer::HeapGraphSerializer( Client* client)47 : m_ client(client)46 HeapGraphSerializer::HeapGraphSerializer(InspectorFrontend::Memory* frontend) 47 : m_frontend(frontend) 48 48 , m_strings(Strings::create()) 49 49 , m_edges(Edges::create()) … … 51 51 , m_nodes(Nodes::create()) 52 52 , m_baseToRealNodeIdMap(BaseToRealNodeIdMap::create()) 53 , m_leafCount(0) 54 { 55 ASSERT(m_client); 53 { 54 ASSERT(m_frontend); 56 55 m_strings->addItem(String()); // An empty string with 0 index. 57 56 … … 93 92 .setBaseToRealNodeId(m_baseToRealNodeIdMap.release()); 94 93 95 m_ client->addNativeSnapshotChunk(chunk.release());94 m_frontend->addNativeSnapshotChunk(chunk); 96 95 97 96 m_strings = Strings::create(); … … 103 102 void HeapGraphSerializer::reportNode(const WTF::MemoryObjectInfo& info) 104 103 { 105 ASSERT(info.reportedPointer());106 104 reportNodeImpl(info, m_nodeEdgesCount); 107 105 m_nodeEdgesCount = 0; … … 185 183 int HeapGraphSerializer::toNodeId(const void* to) 186 184 { 187 if (!to) 188 return s_firstNodeId + m_address2NodeIdMap.size() + m_leafCount++; 189 190 Address2NodeId::AddResult result = m_address2NodeIdMap.add(to, s_firstNodeId + m_leafCount + m_address2NodeIdMap.size()); 185 ASSERT(to); 186 Address2NodeId::AddResult result = m_address2NodeIdMap.add(to, m_address2NodeIdMap.size()); 191 187 return result.iterator->value; 192 188 } … … 199 195 m_nodes->addItem(addString("Root")); 200 196 m_nodes->addItem(0); 201 m_nodes->addItem( s_firstNodeId + m_address2NodeIdMap.size() + m_leafCount);197 m_nodes->addItem(m_address2NodeIdMap.size()); 202 198 m_nodes->addItem(0); 203 199 m_nodes->addItem(m_roots.size()); -
trunk/Source/WebCore/inspector/HeapGraphSerializer.h
r142747 r142795 44 44 namespace WebCore { 45 45 46 class HeapGraphEdge; 47 class HeapGraphNode; 48 class InspectorObject; 49 46 50 class HeapGraphSerializer { 47 51 WTF_MAKE_NONCOPYABLE(HeapGraphSerializer); 48 52 public: 49 50 class Client { 51 public: 52 virtual ~Client() { } 53 virtual void addNativeSnapshotChunk(PassRefPtr<TypeBuilder::Memory::HeapSnapshotChunk>) = 0; 54 }; 55 56 explicit HeapGraphSerializer(Client*); 53 explicit HeapGraphSerializer(InspectorFrontend::Memory*); 57 54 ~HeapGraphSerializer(); 58 55 void reportNode(const WTF::MemoryObjectInfo&); … … 77 74 int reportNodeImpl(const WTF::MemoryObjectInfo&, int edgesCount); 78 75 79 Client* m_client;76 InspectorFrontend::Memory* m_frontend; 80 77 81 78 typedef HashMap<String, int> StringMap; … … 104 101 size_t m_edgeTypes[WTF::LastMemberTypeEntry]; 105 102 int m_unknownClassNameId; 106 int m_leafCount;107 108 static const int s_firstNodeId = 1;109 103 }; 110 104 -
trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp
r142747 r142795 331 331 } 332 332 333 namespace {334 335 class FrontendWrapper : public HeapGraphSerializer::Client {336 public:337 explicit FrontendWrapper(InspectorFrontend::Memory* frontend) : m_frontend(frontend) { }338 virtual void addNativeSnapshotChunk(PassRefPtr<TypeBuilder::Memory::HeapSnapshotChunk> heapSnapshotChunk) OVERRIDE339 {340 m_frontend->addNativeSnapshotChunk(heapSnapshotChunk);341 }342 private:343 InspectorFrontend::Memory* m_frontend;344 };345 346 }347 348 333 void InspectorMemoryAgent::getProcessMemoryDistributionImpl(bool reportGraph, TypeNameToSizeMap* memoryInfo) 349 334 { 350 335 OwnPtr<HeapGraphSerializer> graphSerializer; 351 OwnPtr<FrontendWrapper> frontendWrapper; 352 353 if (reportGraph) { 354 frontendWrapper = adoptPtr(new FrontendWrapper(m_frontend)); 355 graphSerializer = adoptPtr(new HeapGraphSerializer(frontendWrapper.get())); 356 } 357 336 if (reportGraph) 337 graphSerializer = adoptPtr(new HeapGraphSerializer(m_frontend)); 358 338 MemoryInstrumentationClientImpl memoryInstrumentationClient(graphSerializer.get()); 359 339 m_inspectorClient->getAllocatedObjects(memoryInstrumentationClient.allocatedObjects()); … … 373 353 memoryInstrumentation.addRootObject(graphSerializer.get()); 374 354 graphSerializer->finish(); 375 graphSerializer.release(); // Release it earlier than frontendWrapper376 frontendWrapper.release();377 355 } 378 356 -
trunk/Tools/ChangeLog
r142790 r142795 1 2013-02-13 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r142747. 4 http://trac.webkit.org/changeset/142747 5 https://bugs.webkit.org/show_bug.cgi?id=109746 6 7 broke component build (Requested by alecf_gardening on 8 #webkit). 9 10 * TestWebKitAPI/TestWebKitAPI.gypi: 11 * TestWebKitAPI/Tests/WebCore/HeapGraphSerializerTest.cpp: Removed. 12 1 13 2013-02-13 Jochen Eisinger <jochen@chromium.org> 2 14 -
trunk/Tools/TestWebKitAPI/TestWebKitAPI.gypi
r142747 r142795 32 32 'variables': { 33 33 'TestWebKitAPI_files': [ 34 'Tests/WebCore/HeapGraphSerializerTest.cpp',35 34 'Tests/WebCore/LayoutUnit.cpp', 36 35 'Tests/WTF/AtomicString.cpp',
Note: See TracChangeset
for help on using the changeset viewer.