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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBlock.cpp

Issue 2672833004: Invalidate width available to children if style diff needs full layout (Closed)
Patch Set: rebase Created 3 years, 10 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
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) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
6 * All rights reserved. 6 * All rights reserved.
7 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 7 * Copyright (C) Research In Motion Limited 2010. 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 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 232
233 if (TextAutosizer* textAutosizer = document().textAutosizer()) 233 if (TextAutosizer* textAutosizer = document().textAutosizer())
234 textAutosizer->record(this); 234 textAutosizer->record(this);
235 235
236 propagateStyleToAnonymousChildren(); 236 propagateStyleToAnonymousChildren();
237 237
238 // It's possible for our border/padding to change, but for the overall logical 238 // It's possible for our border/padding to change, but for the overall logical
239 // width or height of the block to end up being the same. We keep track of 239 // width or height of the block to end up being the same. We keep track of
240 // this change so in layoutBlock, we can know to set relayoutChildren=true. 240 // this change so in layoutBlock, we can know to set relayoutChildren=true.
241 m_widthAvailableToChildrenChanged |= 241 m_widthAvailableToChildrenChanged |=
242 oldStyle && diff.needsFullLayout() && needsLayout() && 242 oldStyle && needsLayout() &&
243 borderOrPaddingLogicalDimensionChanged(*oldStyle, newStyle, LogicalWidth); 243 (diff.needsFullLayout() || borderOrPaddingLogicalDimensionChanged(
244 *oldStyle, newStyle, LogicalWidth));
244 m_heightAvailableToChildrenChanged |= oldStyle && diff.needsFullLayout() && 245 m_heightAvailableToChildrenChanged |= oldStyle && diff.needsFullLayout() &&
245 needsLayout() && 246 needsLayout() &&
246 borderOrPaddingLogicalDimensionChanged( 247 borderOrPaddingLogicalDimensionChanged(
247 *oldStyle, newStyle, LogicalHeight); 248 *oldStyle, newStyle, LogicalHeight);
248 } 249 }
249 250
250 void LayoutBlock::updateFromStyle() { 251 void LayoutBlock::updateFromStyle() {
251 LayoutBox::updateFromStyle(); 252 LayoutBox::updateFromStyle();
252 253
253 bool shouldClipOverflow = 254 bool shouldClipOverflow =
(...skipping 1951 matching lines...) Expand 10 before | Expand all | Expand 10 after
2205 } 2206 }
2206 2207
2207 return availableHeight; 2208 return availableHeight;
2208 } 2209 }
2209 2210
2210 bool LayoutBlock::hasDefiniteLogicalHeight() const { 2211 bool LayoutBlock::hasDefiniteLogicalHeight() const {
2211 return availableLogicalHeightForPercentageComputation() != LayoutUnit(-1); 2212 return availableLogicalHeightForPercentageComputation() != LayoutUnit(-1);
2212 } 2213 }
2213 2214
2214 } // namespace blink 2215 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698