Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(308)

Side by Side Diff: Source/core/rendering/RenderBlock.cpp

Issue 13973026: remove memoryinstrumentation Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: remove the rest part of MemoryInstrumentation Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderBlock.h ('k') | Source/core/rendering/RenderBox.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 #include "RenderRegion.h" 57 #include "RenderRegion.h"
58 #include "RenderReplica.h" 58 #include "RenderReplica.h"
59 #include "RenderTableCell.h" 59 #include "RenderTableCell.h"
60 #include "RenderTextFragment.h" 60 #include "RenderTextFragment.h"
61 #include "RenderTheme.h" 61 #include "RenderTheme.h"
62 #include "RenderView.h" 62 #include "RenderView.h"
63 #include "Settings.h" 63 #include "Settings.h"
64 #include "SVGTextRunRenderingContext.h" 64 #include "SVGTextRunRenderingContext.h"
65 #include "ShadowRoot.h" 65 #include "ShadowRoot.h"
66 #include "TransformState.h" 66 #include "TransformState.h"
67 #include "WebCoreMemoryInstrumentation.h"
68 #include <wtf/StdLibExtras.h> 67 #include <wtf/StdLibExtras.h>
69 #if ENABLE(CSS_EXCLUSIONS) 68 #if ENABLE(CSS_EXCLUSIONS)
70 #include "ExclusionShapeInsideInfo.h" 69 #include "ExclusionShapeInsideInfo.h"
71 #include "ExclusionShapeOutsideInfo.h" 70 #include "ExclusionShapeOutsideInfo.h"
72 #endif 71 #endif
73 #include <wtf/MemoryInstrumentationHashMap.h>
74 #include <wtf/MemoryInstrumentationHashSet.h>
75 #include <wtf/MemoryInstrumentationListHashSet.h>
76 #include <wtf/TemporaryChange.h> 72 #include <wtf/TemporaryChange.h>
77 73
78 using namespace std; 74 using namespace std;
79 using namespace WTF; 75 using namespace WTF;
80 using namespace Unicode; 76 using namespace Unicode;
81 77
82 namespace WebCore { 78 namespace WebCore {
83 79
84 using namespace HTMLNames; 80 using namespace HTMLNames;
85 81
(...skipping 8007 matching lines...) Expand 10 before | Expand all | Expand 10 after
8093 return String::number(value); 8089 return String::number(value);
8094 } 8090 }
8095 8091
8096 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::Fl oatingObject* floatingObject) 8092 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::Fl oatingObject* floatingObject)
8097 { 8093 {
8098 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->fr ameRect().pixelSnappedX(), floatingObject->frameRect().pixelSnappedY(), floating Object->frameRect().pixelSnappedMaxX(), floatingObject->frameRect().pixelSnapped MaxY()); 8094 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->fr ameRect().pixelSnappedX(), floatingObject->frameRect().pixelSnappedY(), floating Object->frameRect().pixelSnappedMaxX(), floatingObject->frameRect().pixelSnapped MaxY());
8099 } 8095 }
8100 8096
8101 #endif 8097 #endif
8102 8098
8103 void RenderBlock::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
8104 {
8105 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering) ;
8106 RenderBox::reportMemoryUsage(memoryObjectInfo);
8107 info.addMember(m_floatingObjects, "floatingObjects");
8108 info.addMember(m_rareData, "rareData");
8109 info.addMember(m_children, "children");
8110 info.addMember(m_lineBoxes, "lineBoxes");
8111 }
8112
8113 void RenderBlock::reportStaticMembersMemoryUsage(MemoryInstrumentation* memoryIn strumentation)
8114 {
8115 memoryInstrumentation->addRootObject(gColumnInfoMap, WebCoreMemoryTypes::Ren deringStructures);
8116 memoryInstrumentation->addRootObject(gPositionedDescendantsMap, WebCoreMemor yTypes::RenderingStructures);
8117 memoryInstrumentation->addRootObject(gPercentHeightDescendantsMap, WebCoreMe moryTypes::RenderingStructures);
8118 memoryInstrumentation->addRootObject(gPositionedContainerMap, WebCoreMemoryT ypes::RenderingStructures);
8119 memoryInstrumentation->addRootObject(gPercentHeightContainerMap, WebCoreMemo ryTypes::RenderingStructures);
8120 memoryInstrumentation->addRootObject(gDelayedUpdateScrollInfoSet, WebCoreMem oryTypes::RenderingStructures);
8121 }
8122
8123 } // namespace WebCore 8099 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlock.h ('k') | Source/core/rendering/RenderBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698