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

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

Issue 16896019: Replace RenderArena with PartitionAlloc. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 if (child->nextOnLine()) 192 if (child->nextOnLine())
193 child->nextOnLine()->setPrevOnLine(child->prevOnLine()); 193 child->nextOnLine()->setPrevOnLine(child->prevOnLine());
194 if (child->prevOnLine()) 194 if (child->prevOnLine())
195 child->prevOnLine()->setNextOnLine(child->nextOnLine()); 195 child->prevOnLine()->setNextOnLine(child->nextOnLine());
196 196
197 child->setParent(0); 197 child->setParent(0);
198 198
199 checkConsistency(); 199 checkConsistency();
200 } 200 }
201 201
202 void InlineFlowBox::deleteLine(RenderArena* arena) 202 void InlineFlowBox::deleteLine()
203 { 203 {
204 InlineBox* child = firstChild(); 204 InlineBox* child = firstChild();
205 InlineBox* next = 0; 205 InlineBox* next = 0;
206 while (child) { 206 while (child) {
207 ASSERT(this == child->parent()); 207 ASSERT(this == child->parent());
208 next = child->nextOnLine(); 208 next = child->nextOnLine();
209 #ifndef NDEBUG 209 #ifndef NDEBUG
210 child->setParent(0); 210 child->setParent(0);
211 #endif 211 #endif
212 child->deleteLine(arena); 212 child->deleteLine();
213 child = next; 213 child = next;
214 } 214 }
215 #ifndef NDEBUG 215 #ifndef NDEBUG
216 m_firstChild = 0; 216 m_firstChild = 0;
217 m_lastChild = 0; 217 m_lastChild = 0;
218 #endif 218 #endif
219 219
220 removeLineBoxFromRenderObject(); 220 removeLineBoxFromRenderObject();
221 destroy(arena); 221 destroy();
222 } 222 }
223 223
224 void InlineFlowBox::removeLineBoxFromRenderObject() 224 void InlineFlowBox::removeLineBoxFromRenderObject()
225 { 225 {
226 toRenderInline(renderer())->lineBoxes()->removeLineBox(this); 226 toRenderInline(renderer())->lineBoxes()->removeLineBox(this);
227 } 227 }
228 228
229 void InlineFlowBox::extractLine() 229 void InlineFlowBox::extractLine()
230 { 230 {
231 if (!extracted()) 231 if (!extracted())
(...skipping 1415 matching lines...) Expand 10 before | Expand all | Expand 10 after
1647 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Rendering); 1647 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Rendering);
1648 InlineBox::reportMemoryUsage(memoryObjectInfo); 1648 InlineBox::reportMemoryUsage(memoryObjectInfo);
1649 info.addMember(m_overflow, "overflow"); 1649 info.addMember(m_overflow, "overflow");
1650 info.addMember(m_firstChild, "firstChild"); 1650 info.addMember(m_firstChild, "firstChild");
1651 info.addMember(m_lastChild, "lastChild"); 1651 info.addMember(m_lastChild, "lastChild");
1652 info.addMember(m_prevLineBox, "prevLineBox"); 1652 info.addMember(m_prevLineBox, "prevLineBox");
1653 info.addMember(m_nextLineBox, "nextLineBox"); 1653 info.addMember(m_nextLineBox, "nextLineBox");
1654 } 1654 }
1655 1655
1656 } // namespace WebCore 1656 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698