Changeset 142795 in webkit


Ignore:
Timestamp:
Feb 13, 2013 2:02:51 PM (11 years ago)
Author:
alecflett@chromium.org
Message:

Unreviewed, rolling out r142747.
http://trac.webkit.org/changeset/142747
https://bugs.webkit.org/show_bug.cgi?id=109746

broke component build (Requested by alecf_gardening on
#webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2013-02-13

Source/WebCore:

  • inspector/HeapGraphSerializer.cpp:

(WebCore::HeapGraphSerializer::HeapGraphSerializer):
(WebCore::HeapGraphSerializer::pushUpdate):
(WebCore::HeapGraphSerializer::reportNode):
(WebCore::HeapGraphSerializer::toNodeId):
(WebCore::HeapGraphSerializer::addRootNode):

  • inspector/HeapGraphSerializer.h:

(WebCore):
(HeapGraphSerializer):

  • inspector/InspectorMemoryAgent.cpp:

(WebCore::InspectorMemoryAgent::getProcessMemoryDistributionImpl):

Tools:

  • TestWebKitAPI/TestWebKitAPI.gypi:
  • TestWebKitAPI/Tests/WebCore/HeapGraphSerializerTest.cpp: Removed.
Location:
trunk
Files:
1 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r142793 r142795  
     12013-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
    1222013-02-13  Levi Weintraub  <leviw@chromium.org>
    223
  • trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp

    r142747 r142795  
    4444namespace WebCore {
    4545
    46 HeapGraphSerializer::HeapGraphSerializer(Client* client)
    47     : m_client(client)
     46HeapGraphSerializer::HeapGraphSerializer(InspectorFrontend::Memory* frontend)
     47    : m_frontend(frontend)
    4848    , m_strings(Strings::create())
    4949    , m_edges(Edges::create())
     
    5151    , m_nodes(Nodes::create())
    5252    , m_baseToRealNodeIdMap(BaseToRealNodeIdMap::create())
    53     , m_leafCount(0)
    54 {
    55     ASSERT(m_client);
     53{
     54    ASSERT(m_frontend);
    5655    m_strings->addItem(String()); // An empty string with 0 index.
    5756
     
    9392        .setBaseToRealNodeId(m_baseToRealNodeIdMap.release());
    9493
    95     m_client->addNativeSnapshotChunk(chunk.release());
     94    m_frontend->addNativeSnapshotChunk(chunk);
    9695
    9796    m_strings = Strings::create();
     
    103102void HeapGraphSerializer::reportNode(const WTF::MemoryObjectInfo& info)
    104103{
    105     ASSERT(info.reportedPointer());
    106104    reportNodeImpl(info, m_nodeEdgesCount);
    107105    m_nodeEdgesCount = 0;
     
    185183int HeapGraphSerializer::toNodeId(const void* to)
    186184{
    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());
    191187    return result.iterator->value;
    192188}
     
    199195    m_nodes->addItem(addString("Root"));
    200196    m_nodes->addItem(0);
    201     m_nodes->addItem(s_firstNodeId + m_address2NodeIdMap.size() + m_leafCount);
     197    m_nodes->addItem(m_address2NodeIdMap.size());
    202198    m_nodes->addItem(0);
    203199    m_nodes->addItem(m_roots.size());
  • trunk/Source/WebCore/inspector/HeapGraphSerializer.h

    r142747 r142795  
    4444namespace WebCore {
    4545
     46class HeapGraphEdge;
     47class HeapGraphNode;
     48class InspectorObject;
     49
    4650class HeapGraphSerializer {
    4751    WTF_MAKE_NONCOPYABLE(HeapGraphSerializer);
    4852public:
    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*);
    5754    ~HeapGraphSerializer();
    5855    void reportNode(const WTF::MemoryObjectInfo&);
     
    7774    int reportNodeImpl(const WTF::MemoryObjectInfo&, int edgesCount);
    7875
    79     Client* m_client;
     76    InspectorFrontend::Memory* m_frontend;
    8077
    8178    typedef HashMap<String, int> StringMap;
     
    104101    size_t m_edgeTypes[WTF::LastMemberTypeEntry];
    105102    int m_unknownClassNameId;
    106     int m_leafCount;
    107 
    108     static const int s_firstNodeId = 1;
    109103};
    110104
  • trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp

    r142747 r142795  
    331331}
    332332
    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) OVERRIDE
    339     {
    340         m_frontend->addNativeSnapshotChunk(heapSnapshotChunk);
    341     }
    342 private:
    343     InspectorFrontend::Memory* m_frontend;
    344 };
    345 
    346 }
    347 
    348333void InspectorMemoryAgent::getProcessMemoryDistributionImpl(bool reportGraph, TypeNameToSizeMap* memoryInfo)
    349334{
    350335    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));
    358338    MemoryInstrumentationClientImpl memoryInstrumentationClient(graphSerializer.get());
    359339    m_inspectorClient->getAllocatedObjects(memoryInstrumentationClient.allocatedObjects());
     
    373353        memoryInstrumentation.addRootObject(graphSerializer.get());
    374354        graphSerializer->finish();
    375         graphSerializer.release(); // Release it earlier than frontendWrapper
    376         frontendWrapper.release();
    377355    }
    378356
  • trunk/Tools/ChangeLog

    r142790 r142795  
     12013-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
    1132013-02-13  Jochen Eisinger  <jochen@chromium.org>
    214
  • trunk/Tools/TestWebKitAPI/TestWebKitAPI.gypi

    r142747 r142795  
    3232    'variables': {
    3333        'TestWebKitAPI_files': [
    34             'Tests/WebCore/HeapGraphSerializerTest.cpp',
    3534            'Tests/WebCore/LayoutUnit.cpp',
    3635            'Tests/WTF/AtomicString.cpp',
Note: See TracChangeset for help on using the changeset viewer.