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

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

Issue 23668002: Avoid leaking ThreadingPrimitives.h from StackStats.h when collection is off. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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/RenderListBox.cpp ('k') | Source/core/rendering/RenderListMarker.cpp » ('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 * Copyright (C) 2003, 2004, 2005, 2006, 2010 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2010 Apple Inc. All rights reserved.
5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 m_marker->updateMarginsAndContent(); 295 m_marker->updateMarginsAndContent();
296 // If markerParent is an anonymous block that has lost all its child ren, destroy it. 296 // If markerParent is an anonymous block that has lost all its child ren, destroy it.
297 if (markerParent && markerParent->isAnonymousBlock() && !markerParen t->firstChild() && !toRenderBlock(markerParent)->continuation()) 297 if (markerParent && markerParent->isAnonymousBlock() && !markerParen t->firstChild() && !toRenderBlock(markerParent)->continuation())
298 markerParent->destroy(); 298 markerParent->destroy();
299 } 299 }
300 } 300 }
301 } 301 }
302 302
303 void RenderListItem::layout() 303 void RenderListItem::layout()
304 { 304 {
305 StackStats::LayoutCheckPoint layoutCheckPoint;
306 ASSERT(needsLayout()); 305 ASSERT(needsLayout());
307 306
308 updateMarkerLocation(); 307 updateMarkerLocation();
309 RenderBlock::layout(); 308 RenderBlock::layout();
310 } 309 }
311 310
312 void RenderListItem::addOverflowFromChildren() 311 void RenderListItem::addOverflowFromChildren()
313 { 312 {
314 RenderBlock::addOverflowFromChildren(); 313 RenderBlock::addOverflowFromChildren();
315 positionListMarker(); 314 positionListMarker();
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 // assume that all the following ones have too. 504 // assume that all the following ones have too.
506 // This gives us the opportunity to stop here and avoid 505 // This gives us the opportunity to stop here and avoid
507 // marking the same nodes again. 506 // marking the same nodes again.
508 break; 507 break;
509 } 508 }
510 item->updateValue(); 509 item->updateValue();
511 } 510 }
512 } 511 }
513 512
514 } // namespace WebCore 513 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderListBox.cpp ('k') | Source/core/rendering/RenderListMarker.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698