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

Side by Side Diff: Source/core/rendering/RenderBox.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/RenderBlock.cpp ('k') | Source/core/rendering/RenderEmbeddedObject.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 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 setHasOverflowClip(); 376 setHasOverflowClip();
377 } 377 }
378 } 378 }
379 379
380 setHasTransform(styleToUse->hasTransformRelatedProperty()); 380 setHasTransform(styleToUse->hasTransformRelatedProperty());
381 setHasReflection(styleToUse->boxReflect()); 381 setHasReflection(styleToUse->boxReflect());
382 } 382 }
383 383
384 void RenderBox::layout() 384 void RenderBox::layout()
385 { 385 {
386 StackStats::LayoutCheckPoint layoutCheckPoint;
387 ASSERT(needsLayout()); 386 ASSERT(needsLayout());
388 387
389 RenderObject* child = firstChild(); 388 RenderObject* child = firstChild();
390 if (!child) { 389 if (!child) {
391 clearNeedsLayout(); 390 clearNeedsLayout();
392 return; 391 return;
393 } 392 }
394 393
395 LayoutStateMaintainer statePusher(view(), this, locationOffset(), style()->i sFlippedBlocksWritingMode()); 394 LayoutStateMaintainer statePusher(view(), this, locationOffset(), style()->i sFlippedBlocksWritingMode());
396 while (child) { 395 while (child) {
(...skipping 4338 matching lines...) Expand 10 before | Expand all | Expand 10 after
4735 } 4734 }
4736 4735
4737 if (didSplitParentAnonymousBoxes) 4736 if (didSplitParentAnonymousBoxes)
4738 markBoxForRelayoutAfterSplit(this); 4737 markBoxForRelayoutAfterSplit(this);
4739 4738
4740 ASSERT(beforeChild->parent() == this); 4739 ASSERT(beforeChild->parent() == this);
4741 return beforeChild; 4740 return beforeChild;
4742 } 4741 }
4743 4742
4744 } // namespace WebCore 4743 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlock.cpp ('k') | Source/core/rendering/RenderEmbeddedObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698