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

Side by Side Diff: Source/core/rendering/RenderView.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/RenderView.h ('k') | Source/core/rendering/style/DataRef.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 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 25 matching lines...) Expand all
36 #include "RenderGeometryMap.h" 36 #include "RenderGeometryMap.h"
37 #include "RenderLayer.h" 37 #include "RenderLayer.h"
38 #include "RenderLayerBacking.h" 38 #include "RenderLayerBacking.h"
39 #include "RenderLayerCompositor.h" 39 #include "RenderLayerCompositor.h"
40 #include "RenderNamedFlowThread.h" 40 #include "RenderNamedFlowThread.h"
41 #include "RenderSelectionInfo.h" 41 #include "RenderSelectionInfo.h"
42 #include "RenderWidget.h" 42 #include "RenderWidget.h"
43 #include "RenderWidgetProtector.h" 43 #include "RenderWidgetProtector.h"
44 #include "StyleInheritedData.h" 44 #include "StyleInheritedData.h"
45 #include "TransformState.h" 45 #include "TransformState.h"
46 #include "WebCoreMemoryInstrumentation.h"
47 46
48 #if USE(3D_GRAPHICS) 47 #if USE(3D_GRAPHICS)
49 #include "CustomFilterGlobalContext.h" 48 #include "CustomFilterGlobalContext.h"
50 #endif 49 #endif
51 50
52 namespace WebCore { 51 namespace WebCore {
53 52
54 RenderView::RenderView(Document* document) 53 RenderView::RenderView(Document* document)
55 : RenderBlock(document) 54 : RenderBlock(document)
56 , m_frameView(document->view()) 55 , m_frameView(document->view())
(...skipping 1051 matching lines...) Expand 10 before | Expand all | Expand 10 after
1108 return m_flowThreadController.get(); 1107 return m_flowThreadController.get();
1109 } 1108 }
1110 1109
1111 RenderBlock::IntervalArena* RenderView::intervalArena() 1110 RenderBlock::IntervalArena* RenderView::intervalArena()
1112 { 1111 {
1113 if (!m_intervalArena) 1112 if (!m_intervalArena)
1114 m_intervalArena = IntervalArena::create(); 1113 m_intervalArena = IntervalArena::create();
1115 return m_intervalArena.get(); 1114 return m_intervalArena.get();
1116 } 1115 }
1117 1116
1118 void RenderView::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
1119 {
1120 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering) ;
1121 RenderBlock::reportMemoryUsage(memoryObjectInfo);
1122 info.addWeakPointer(m_frameView);
1123 info.addWeakPointer(m_selectionStart);
1124 info.addWeakPointer(m_selectionEnd);
1125 info.addMember(m_widgets, "widgets");
1126 info.addMember(m_layoutState, "layoutState");
1127 info.addMember(m_compositor, "compositor");
1128 #if USE(3D_GRAPHICS)
1129 info.addMember(m_customFilterGlobalContext, "customFilterGlobalContext");
1130 #endif
1131 info.addMember(m_flowThreadController, "flowThreadController");
1132 info.addMember(m_intervalArena, "intervalArena");
1133 info.addWeakPointer(m_renderQuoteHead);
1134 info.addMember(m_legacyPrinting, "legacyPrinting");
1135 }
1136
1137 FragmentationDisabler::FragmentationDisabler(RenderObject* root) 1117 FragmentationDisabler::FragmentationDisabler(RenderObject* root)
1138 { 1118 {
1139 RenderView* renderView = root->view(); 1119 RenderView* renderView = root->view();
1140 ASSERT(renderView); 1120 ASSERT(renderView);
1141 1121
1142 LayoutState* layoutState = renderView->layoutState(); 1122 LayoutState* layoutState = renderView->layoutState();
1143 1123
1144 m_root = root; 1124 m_root = root;
1145 m_fragmenting = layoutState && layoutState->isPaginated(); 1125 m_fragmenting = layoutState && layoutState->isPaginated();
1146 m_flowThreadState = m_root->flowThreadState(); 1126 m_flowThreadState = m_root->flowThreadState();
(...skipping 19 matching lines...) Expand all
1166 #endif 1146 #endif
1167 1147
1168 if (layoutState) 1148 if (layoutState)
1169 layoutState->m_isPaginated = m_fragmenting; 1149 layoutState->m_isPaginated = m_fragmenting;
1170 1150
1171 if (m_flowThreadState != RenderObject::NotInsideFlowThread) 1151 if (m_flowThreadState != RenderObject::NotInsideFlowThread)
1172 m_root->setFlowThreadStateIncludingDescendants(m_flowThreadState); 1152 m_root->setFlowThreadStateIncludingDescendants(m_flowThreadState);
1173 } 1153 }
1174 1154
1175 } // namespace WebCore 1155 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderView.h ('k') | Source/core/rendering/style/DataRef.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698