OLD | NEW |
1 /* | 1 /* |
2 * This file is part of the layout object implementation for KHTML. | 2 * This file is part of the layout object implementation for KHTML. |
3 * | 3 * |
4 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 4 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
5 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 5 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
6 * Copyright (C) 2003 Apple Computer, Inc. | 6 * Copyright (C) 2003 Apple Computer, Inc. |
7 * | 7 * |
8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
359 } | 359 } |
360 | 360 |
361 void LayoutDeprecatedFlexibleBox::layoutBlock(bool relayoutChildren) { | 361 void LayoutDeprecatedFlexibleBox::layoutBlock(bool relayoutChildren) { |
362 ASSERT(needsLayout()); | 362 ASSERT(needsLayout()); |
363 | 363 |
364 if (!relayoutChildren && simplifiedLayout()) | 364 if (!relayoutChildren && simplifiedLayout()) |
365 return; | 365 return; |
366 | 366 |
367 { | 367 { |
368 // LayoutState needs this deliberate scope to pop before paint invalidation. | 368 // LayoutState needs this deliberate scope to pop before paint invalidation. |
369 LayoutState state(*this, locationOffset()); | 369 LayoutState state(*this); |
370 | 370 |
371 LayoutSize previousSize = size(); | 371 LayoutSize previousSize = size(); |
372 | 372 |
373 updateLogicalWidth(); | 373 updateLogicalWidth(); |
374 updateLogicalHeight(); | 374 updateLogicalHeight(); |
375 | 375 |
376 TextAutosizer::LayoutScope textAutosizerLayoutScope(this); | 376 TextAutosizer::LayoutScope textAutosizerLayoutScope(this); |
377 | 377 |
378 if (previousSize != size() || | 378 if (previousSize != size() || |
379 (parent()->isDeprecatedFlexibleBox() && | 379 (parent()->isDeprecatedFlexibleBox() && |
(...skipping 881 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1261 if (minHeight.isFixed() || minHeight.isAuto()) { | 1261 if (minHeight.isFixed() || minHeight.isAuto()) { |
1262 LayoutUnit minHeight(child->style()->minHeight().value()); | 1262 LayoutUnit minHeight(child->style()->minHeight().value()); |
1263 LayoutUnit height = contentHeightForChild(child); | 1263 LayoutUnit height = contentHeightForChild(child); |
1264 LayoutUnit allowedShrinkage = (minHeight - height).clampPositiveToZero(); | 1264 LayoutUnit allowedShrinkage = (minHeight - height).clampPositiveToZero(); |
1265 return allowedShrinkage; | 1265 return allowedShrinkage; |
1266 } | 1266 } |
1267 return LayoutUnit(); | 1267 return LayoutUnit(); |
1268 } | 1268 } |
1269 | 1269 |
1270 } // namespace blink | 1270 } // namespace blink |
OLD | NEW |