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

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

Issue 19558006: Heap-use-after-free in WebCore::RenderFlexibleBox::firstLineBoxBaseline (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Removed bad FINAL 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2011 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 // we apply (and test the interaction with) min-width / max-width. 244 // we apply (and test the interaction with) min-width / max-width.
245 245
246 computeIntrinsicLogicalWidths(m_minPreferredLogicalWidth, m_maxPreferredLogi calWidth); 246 computeIntrinsicLogicalWidths(m_minPreferredLogicalWidth, m_maxPreferredLogi calWidth);
247 247
248 LayoutUnit borderAndPaddingInInlineDirection = borderAndPaddingLogicalWidth( ); 248 LayoutUnit borderAndPaddingInInlineDirection = borderAndPaddingLogicalWidth( );
249 m_minPreferredLogicalWidth += borderAndPaddingInInlineDirection; 249 m_minPreferredLogicalWidth += borderAndPaddingInInlineDirection;
250 m_maxPreferredLogicalWidth += borderAndPaddingInInlineDirection; 250 m_maxPreferredLogicalWidth += borderAndPaddingInInlineDirection;
251 251
252 setPreferredLogicalWidthsDirty(false); 252 setPreferredLogicalWidthsDirty(false);
253 } 253 }
254 void RenderGrid::removeChild(RenderObject* child)
ojan 2013/07/19 20:27:50 Needs linebreak
Julien - ping for review 2013/07/19 20:52:31 Done.
255 {
256 m_orderIterator.invalidate();
257
258 RenderBlock::removeChild(child);
259 }
254 260
255 LayoutUnit RenderGrid::computePreferredTrackWidth(const GridLength& gridLength, size_t trackIndex) const 261 LayoutUnit RenderGrid::computePreferredTrackWidth(const GridLength& gridLength, size_t trackIndex) const
256 { 262 {
257 if (gridLength.isFlex()) 263 if (gridLength.isFlex())
258 return 0; 264 return 0;
259 265
260 const Length& length = gridLength.length(); 266 const Length& length = gridLength.length();
261 267
262 if (length.isFixed()) { 268 if (length.isFixed()) {
263 // Grid areas don't have borders, margins or paddings so we don't need t o account for them. 269 // Grid areas don't have borders, margins or paddings so we don't need t o account for them.
(...skipping 787 matching lines...) Expand 10 before | Expand all | Expand 10 after
1051 if (isOutOfFlowPositioned()) 1057 if (isOutOfFlowPositioned())
1052 return "RenderGrid (positioned)"; 1058 return "RenderGrid (positioned)";
1053 if (isAnonymous()) 1059 if (isAnonymous())
1054 return "RenderGrid (generated)"; 1060 return "RenderGrid (generated)";
1055 if (isRelPositioned()) 1061 if (isRelPositioned())
1056 return "RenderGrid (relative positioned)"; 1062 return "RenderGrid (relative positioned)";
1057 return "RenderGrid"; 1063 return "RenderGrid";
1058 } 1064 }
1059 1065
1060 } // namespace WebCore 1066 } // namespace WebCore
OLDNEW
« Source/core/rendering/OrderIterator.cpp ('K') | « Source/core/rendering/RenderGrid.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698