Changeset 137169 in webkit


Ignore:
Timestamp:
Dec 10, 2012 9:31:35 AM (11 years ago)
Author:
loislo@chromium.org
Message:

Web Inspector: Native Memory Instrumentation: instrument RenderBox descendants.
​https://bugs.webkit.org/show_bug.cgi?id=104026

Reviewed by Eric Seidel.

Plain vanilla instrumentation for RenderBox descendants.

  • rendering/RenderFrameSet.cpp:

(WebCore::RenderFrameSet::reportMemoryUsage):
(WebCore):
(WebCore::RenderFrameSet::GridAxis::reportMemoryUsage):

  • rendering/RenderFrameSet.h:

(RenderFrameSet):
(GridAxis):

  • rendering/RenderListMarker.cpp:

(WebCore::RenderListMarker::reportMemoryUsage):
(WebCore):

  • rendering/RenderListMarker.h:

(RenderListMarker):

  • rendering/RenderReplaced.cpp:

(WebCore::RenderReplaced::reportMemoryUsage):
(WebCore):

  • rendering/RenderReplaced.h:

(RenderReplaced):

  • rendering/RenderTableCol.cpp:

(WebCore::RenderTableCol::reportMemoryUsage):
(WebCore):

  • rendering/RenderTableCol.h:

(RenderTableCol):

  • rendering/RenderTableRow.cpp:

(WebCore::RenderTableRow::reportMemoryUsage):
(WebCore):

  • rendering/RenderTableRow.h:

(RenderTableRow):

  • rendering/RenderTableSection.cpp:

(WebCore::RenderTableSection::reportMemoryUsage):
(WebCore):
(WebCore::RenderTableSection::RowStruct::reportMemoryUsage):
(WebCore::RenderTableSection::CellStruct::reportMemoryUsage):

  • rendering/RenderTableSection.h:

(CellStruct):
(RowStruct):

Location:
trunk/Source/WebCore
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r137168 r137169  
     12012-12-10  Ilya Tikhonovsky  <loislo@chromium.org>
     2
     3        Web Inspector: Native Memory Instrumentation: instrument RenderBox descendants.
     4        https://bugs.webkit.org/show_bug.cgi?id=104026
     5
     6        Reviewed by Eric Seidel.
     7
     8        Plain vanilla instrumentation for RenderBox descendants.
     9
     10        * rendering/RenderFrameSet.cpp:
     11        (WebCore::RenderFrameSet::reportMemoryUsage):
     12        (WebCore):
     13        (WebCore::RenderFrameSet::GridAxis::reportMemoryUsage):
     14        * rendering/RenderFrameSet.h:
     15        (RenderFrameSet):
     16        (GridAxis):
     17        * rendering/RenderListMarker.cpp:
     18        (WebCore::RenderListMarker::reportMemoryUsage):
     19        (WebCore):
     20        * rendering/RenderListMarker.h:
     21        (RenderListMarker):
     22        * rendering/RenderReplaced.cpp:
     23        (WebCore::RenderReplaced::reportMemoryUsage):
     24        (WebCore):
     25        * rendering/RenderReplaced.h:
     26        (RenderReplaced):
     27        * rendering/RenderTableCol.cpp:
     28        (WebCore::RenderTableCol::reportMemoryUsage):
     29        (WebCore):
     30        * rendering/RenderTableCol.h:
     31        (RenderTableCol):
     32        * rendering/RenderTableRow.cpp:
     33        (WebCore::RenderTableRow::reportMemoryUsage):
     34        (WebCore):
     35        * rendering/RenderTableRow.h:
     36        (RenderTableRow):
     37        * rendering/RenderTableSection.cpp:
     38        (WebCore::RenderTableSection::reportMemoryUsage):
     39        (WebCore):
     40        (WebCore::RenderTableSection::RowStruct::reportMemoryUsage):
     41        (WebCore::RenderTableSection::CellStruct::reportMemoryUsage):
     42        * rendering/RenderTableSection.h:
     43        (CellStruct):
     44        (RowStruct):
     45
    1462012-12-10  Alejandro Piñeiro  <apinheiro@igalia.com>
    247

  • trunk/Source/WebCore/rendering/RenderFrameSet.cpp

    r131938 r137169  
    4141#include "RenderView.h"
    4242#include "Settings.h"
     43#include "WebCoreMemoryInstrumentation.h"
     44#include <wtf/MemoryInstrumentationVector.h>
    4345
    4446namespace WebCore {
    … …  
    815817}
    816818
     819void RenderFrameSet::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
     820{
     821    MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering);
     822    RenderBox::reportMemoryUsage(memoryObjectInfo);
     823    info.addMember(m_children);
     824    info.addMember(m_rows);
     825    info.addMember(m_cols);
     826}
     827
     828void RenderFrameSet::GridAxis::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
     829{
     830    MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering);
     831    info.addMember(m_sizes);
     832    info.addMember(m_deltas);
     833    info.addMember(m_preventResize);
     834    info.addMember(m_allowBorder);
     835}
     836
    817837} // namespace WebCore

  • trunk/Source/WebCore/rendering/RenderFrameSet.h

    r132995 r137169  
    7777    void notifyFrameEdgeInfoChanged();
    7878
     79    virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
     80
    7981private:
    8082    static const int noSplit = -1;
    … …  
    8587        GridAxis();
    8688        void resize(int);
     89
     90        void reportMemoryUsage(MemoryObjectInfo*) const;
     91
    8792        Vector<int> m_sizes;
    8893        Vector<int> m_deltas;

  • trunk/Source/WebCore/rendering/RenderListMarker.cpp

    r135641 r137169  
    3333#include "RenderListItem.h"
    3434#include "RenderView.h"
     35#include "WebCoreMemoryInstrumentation.h"
    3536#include <wtf/text/StringBuilder.h>
    3637#include <wtf/unicode/CharacterNames.h>
    … …  
    17331734}
    17341735
     1736void RenderListMarker::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
     1737{
     1738    MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering);
     1739    RenderBox::reportMemoryUsage(memoryObjectInfo);
     1740    info.addMember(m_text);
     1741    info.addMember(m_image);
     1742    info.addMember(m_listItem);
     1743}
     1744
    17351745} // namespace WebCore

  • trunk/Source/WebCore/rendering/RenderListMarker.h

    r133845 r137169  
    4545
    4646    bool isInside() const;
     47
     48    virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
    4749
    4850private:

  • trunk/Source/WebCore/rendering/RenderReplaced.cpp

    r136347 r137169  
    3434#include "RenderView.h"
    3535#include "VisiblePosition.h"
     36#include "WebCoreMemoryInstrumentation.h"
    3637
    3738using namespace std;
    … …  
    587588}
    588589
    589 }
     590void RenderReplaced::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
     591{
     592    MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering);
     593    RenderBox::reportMemoryUsage(memoryObjectInfo);
     594}
     595
     596}

  • trunk/Source/WebCore/rendering/RenderReplaced.h

    r133845 r137169  
    3838    bool hasReplacedLogicalWidth() const;
    3939    bool hasReplacedLogicalHeight() const;
     40
     41    virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
    4042
    4143protected:

  • trunk/Source/WebCore/rendering/RenderTableCol.cpp

    r133845 r137169  
    3232#include "RenderTable.h"
    3333#include "RenderTableCell.h"
     34#include "WebCoreMemoryInstrumentation.h"
    3435
    3536namespace WebCore {
    … …  
    188189}
    189190
     191void RenderTableCol::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
     192{
     193    MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering);
     194    RenderBox::reportMemoryUsage(memoryObjectInfo);
     195    info.addMember(m_children);
    190196}
     197
     198}

  • trunk/Source/WebCore/rendering/RenderTableCol.h

    r133845 r137169  
    7777    const BorderValue& borderAdjoiningCellAfter(const RenderTableCell*) const;
    7878
     79    virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
     80
    7981private:
    8082    virtual RenderObjectChildList* virtualChildren() { return children(); }

  • trunk/Source/WebCore/rendering/RenderTableRow.cpp

    r133845 r137169  
    3434#include "RenderView.h"
    3535#include "StyleInheritedData.h"
     36#include "WebCoreMemoryInstrumentation.h"
    3637
    3738namespace WebCore {
    … …  
    269270}
    270271
     272void RenderTableRow::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
     273{
     274    MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering);
     275    RenderBox::reportMemoryUsage(memoryObjectInfo);
     276    info.addMember(m_children);
     277}
     278
    271279} // namespace WebCore

  • trunk/Source/WebCore/rendering/RenderTableRow.h

    r136744 r137169  
    8989    const BorderValue& borderAdjoiningEndCell(const RenderTableCell*) const;
    9090
     91    virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
     92
    9193private:
    9294    virtual RenderObjectChildList* virtualChildren() { return children(); }

  • trunk/Source/WebCore/rendering/RenderTableSection.cpp

    r133439 r137169  
    3636#include "RenderView.h"
    3737#include "StyleInheritedData.h"
     38#include "WebCoreMemoryInstrumentation.h"
    3839#include <limits>
    3940#include <wtf/HashSet.h>
     41#include <wtf/MemoryInstrumentationHashMap.h>
     42#include <wtf/MemoryInstrumentationHashSet.h>
     43#include <wtf/MemoryInstrumentationVector.h>
    4044#include <wtf/Vector.h>
    4145
    … …  
    14391443}
    14401444
     1445void RenderTableSection::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
     1446{
     1447    MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering);
     1448    RenderBox::reportMemoryUsage(memoryObjectInfo);
     1449    info.addMember(m_children);
     1450    info.addMember(m_grid);
     1451    info.addMember(m_rowPos);
     1452    info.addMember(m_overflowingCells);
     1453    info.addMember(m_cellsCollapsedBorders);
     1454}
     1455
     1456void RenderTableSection::RowStruct::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
     1457{
     1458    MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering);
     1459    info.addMember(row);
     1460    info.addMember(rowRenderer);
     1461}
     1462
     1463void RenderTableSection::CellStruct::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
     1464{
     1465    MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering);
     1466    info.addMember(cells);
     1467}
     1468
    14411469} // namespace WebCore

  • trunk/Source/WebCore/rendering/RenderTableSection.h

    r136744 r137169  
    103103
    104104        bool hasCells() const { return cells.size() > 0; }
     105
     106        void reportMemoryUsage(MemoryObjectInfo*) const;
    105107    };
    106108
    … …  
    113115        {
    114116        }
     117
     118        void reportMemoryUsage(MemoryObjectInfo*) const;
    115119
    116120        Row row;
    … …  
    196200    virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE;
    197201
     202    virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
     203
    198204protected:
    199205    virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
Note: See TracChangeset for help on using the changeset viewer.