Changeset 137169 in webkit
- Timestamp:
- Dec 10, 2012 9:31:35 AM (11 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r137168 r137169 1 2012-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 1 46 2012-12-10 Alejandro Piñeiro <apinheiro@igalia.com> 2 47 -
trunk/Source/WebCore/rendering/RenderFrameSet.cpp
r131938 r137169 41 41 #include "RenderView.h" 42 42 #include "Settings.h" 43 #include "WebCoreMemoryInstrumentation.h" 44 #include <wtf/MemoryInstrumentationVector.h> 43 45 44 46 namespace WebCore { … … 815 817 } 816 818 819 void 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 828 void 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 817 837 } // namespace WebCore -
trunk/Source/WebCore/rendering/RenderFrameSet.h
r132995 r137169 77 77 void notifyFrameEdgeInfoChanged(); 78 78 79 virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE; 80 79 81 private: 80 82 static const int noSplit = -1; … … 85 87 GridAxis(); 86 88 void resize(int); 89 90 void reportMemoryUsage(MemoryObjectInfo*) const; 91 87 92 Vector<int> m_sizes; 88 93 Vector<int> m_deltas; -
trunk/Source/WebCore/rendering/RenderListMarker.cpp
r135641 r137169 33 33 #include "RenderListItem.h" 34 34 #include "RenderView.h" 35 #include "WebCoreMemoryInstrumentation.h" 35 36 #include <wtf/text/StringBuilder.h> 36 37 #include <wtf/unicode/CharacterNames.h> … … 1733 1734 } 1734 1735 1736 void 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 1735 1745 } // namespace WebCore -
trunk/Source/WebCore/rendering/RenderListMarker.h
r133845 r137169 45 45 46 46 bool isInside() const; 47 48 virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE; 47 49 48 50 private: -
trunk/Source/WebCore/rendering/RenderReplaced.cpp
r136347 r137169 34 34 #include "RenderView.h" 35 35 #include "VisiblePosition.h" 36 #include "WebCoreMemoryInstrumentation.h" 36 37 37 38 using namespace std; … … 587 588 } 588 589 589 } 590 void 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 38 38 bool hasReplacedLogicalWidth() const; 39 39 bool hasReplacedLogicalHeight() const; 40 41 virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE; 40 42 41 43 protected: -
trunk/Source/WebCore/rendering/RenderTableCol.cpp
r133845 r137169 32 32 #include "RenderTable.h" 33 33 #include "RenderTableCell.h" 34 #include "WebCoreMemoryInstrumentation.h" 34 35 35 36 namespace WebCore { … … 188 189 } 189 190 191 void RenderTableCol::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const 192 { 193 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering); 194 RenderBox::reportMemoryUsage(memoryObjectInfo); 195 info.addMember(m_children); 190 196 } 197 198 } -
trunk/Source/WebCore/rendering/RenderTableCol.h
r133845 r137169 77 77 const BorderValue& borderAdjoiningCellAfter(const RenderTableCell*) const; 78 78 79 virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE; 80 79 81 private: 80 82 virtual RenderObjectChildList* virtualChildren() { return children(); } -
trunk/Source/WebCore/rendering/RenderTableRow.cpp
r133845 r137169 34 34 #include "RenderView.h" 35 35 #include "StyleInheritedData.h" 36 #include "WebCoreMemoryInstrumentation.h" 36 37 37 38 namespace WebCore { … … 269 270 } 270 271 272 void RenderTableRow::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const 273 { 274 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering); 275 RenderBox::reportMemoryUsage(memoryObjectInfo); 276 info.addMember(m_children); 277 } 278 271 279 } // namespace WebCore -
trunk/Source/WebCore/rendering/RenderTableRow.h
r136744 r137169 89 89 const BorderValue& borderAdjoiningEndCell(const RenderTableCell*) const; 90 90 91 virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE; 92 91 93 private: 92 94 virtual RenderObjectChildList* virtualChildren() { return children(); } -
trunk/Source/WebCore/rendering/RenderTableSection.cpp
r133439 r137169 36 36 #include "RenderView.h" 37 37 #include "StyleInheritedData.h" 38 #include "WebCoreMemoryInstrumentation.h" 38 39 #include <limits> 39 40 #include <wtf/HashSet.h> 41 #include <wtf/MemoryInstrumentationHashMap.h> 42 #include <wtf/MemoryInstrumentationHashSet.h> 43 #include <wtf/MemoryInstrumentationVector.h> 40 44 #include <wtf/Vector.h> 41 45 … … 1439 1443 } 1440 1444 1445 void 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 1456 void RenderTableSection::RowStruct::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const 1457 { 1458 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering); 1459 info.addMember(row); 1460 info.addMember(rowRenderer); 1461 } 1462 1463 void RenderTableSection::CellStruct::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const 1464 { 1465 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering); 1466 info.addMember(cells); 1467 } 1468 1441 1469 } // namespace WebCore -
trunk/Source/WebCore/rendering/RenderTableSection.h
r136744 r137169 103 103 104 104 bool hasCells() const { return cells.size() > 0; } 105 106 void reportMemoryUsage(MemoryObjectInfo*) const; 105 107 }; 106 108 … … 113 115 { 114 116 } 117 118 void reportMemoryUsage(MemoryObjectInfo*) const; 115 119 116 120 Row row; … … 196 200 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE; 197 201 202 virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE; 203 198 204 protected: 199 205 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
Note: See TracChangeset
for help on using the changeset viewer.