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

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

Issue 19558006: Heap-use-after-free in WebCore::RenderFlexibleBox::firstLineBoxBaseline (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Updated change after the review's comments Created 7 years, 5 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/RenderFlexibleBox.h ('k') | Source/core/rendering/RenderGrid.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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 // Flex items that were previously stretching need to be relayed out so we can compute new available cross axis space. 258 // Flex items that were previously stretching need to be relayed out so we can compute new available cross axis space.
259 // This is only necessary for stretching since other alignment values do n't change the size of the box. 259 // This is only necessary for stretching since other alignment values do n't change the size of the box.
260 for (RenderBox* child = firstChildBox(); child; child = child->nextSibli ngBox()) { 260 for (RenderBox* child = firstChildBox(); child; child = child->nextSibli ngBox()) {
261 EAlignItems previousAlignment = resolveAlignment(oldStyle, child->st yle()); 261 EAlignItems previousAlignment = resolveAlignment(oldStyle, child->st yle());
262 if (previousAlignment == AlignStretch && previousAlignment != resolv eAlignment(style(), child->style())) 262 if (previousAlignment == AlignStretch && previousAlignment != resolv eAlignment(style(), child->style()))
263 child->setChildNeedsLayout(true, MarkOnlyThis); 263 child->setChildNeedsLayout(true, MarkOnlyThis);
264 } 264 }
265 } 265 }
266 } 266 }
267 267
268 void RenderFlexibleBox::removeChild(RenderObject* child)
269 {
270 m_orderIterator.invalidate();
271
272 RenderBlock::removeChild(child);
273 }
274
268 void RenderFlexibleBox::layoutBlock(bool relayoutChildren, LayoutUnit) 275 void RenderFlexibleBox::layoutBlock(bool relayoutChildren, LayoutUnit)
269 { 276 {
270 ASSERT(needsLayout()); 277 ASSERT(needsLayout());
271 278
272 if (!relayoutChildren && simplifiedLayout()) 279 if (!relayoutChildren && simplifiedLayout())
273 return; 280 return;
274 281
275 LayoutRepainter repainter(*this, checkForRepaintDuringLayout()); 282 LayoutRepainter repainter(*this, checkForRepaintDuringLayout());
276 283
277 if (updateLogicalWidthAndColumnWidth()) 284 if (updateLogicalWidthAndColumnWidth())
(...skipping 1137 matching lines...) Expand 10 before | Expand all | Expand 10 after
1415 ASSERT(child); 1422 ASSERT(child);
1416 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisE xtent; 1423 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisE xtent;
1417 LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset - crossAxisStartEdge; 1424 LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset - crossAxisStartEdge;
1418 LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxi sExtent; 1425 LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxi sExtent;
1419 adjustAlignmentForChild(child, newOffset - originalOffset); 1426 adjustAlignmentForChild(child, newOffset - originalOffset);
1420 } 1427 }
1421 } 1428 }
1422 } 1429 }
1423 1430
1424 } 1431 }
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderFlexibleBox.h ('k') | Source/core/rendering/RenderGrid.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698