| OLD | NEW |
| 1 /* | 1 /* |
| 2 * This file is part of the render object implementation for KHTML. | 2 * This file is part of the render 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 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 continue; | 203 continue; |
| 204 | 204 |
| 205 LayoutUnit margin = marginWidthForChild(child); | 205 LayoutUnit margin = marginWidthForChild(child); |
| 206 minLogicalWidth += child->minPreferredLogicalWidth() + margin; | 206 minLogicalWidth += child->minPreferredLogicalWidth() + margin; |
| 207 maxLogicalWidth += child->maxPreferredLogicalWidth() + margin; | 207 maxLogicalWidth += child->maxPreferredLogicalWidth() + margin; |
| 208 } | 208 } |
| 209 } | 209 } |
| 210 | 210 |
| 211 maxLogicalWidth = std::max(minLogicalWidth, maxLogicalWidth); | 211 maxLogicalWidth = std::max(minLogicalWidth, maxLogicalWidth); |
| 212 | 212 |
| 213 LayoutUnit scrollbarWidth = instrinsicScrollbarLogicalWidth(); | 213 LayoutUnit scrollbarWidth = intrinsicScrollbarLogicalWidth(); |
| 214 maxLogicalWidth += scrollbarWidth; | 214 maxLogicalWidth += scrollbarWidth; |
| 215 minLogicalWidth += scrollbarWidth; | 215 minLogicalWidth += scrollbarWidth; |
| 216 } | 216 } |
| 217 | 217 |
| 218 void RenderDeprecatedFlexibleBox::layoutBlock(bool relayoutChildren) | 218 void RenderDeprecatedFlexibleBox::layoutBlock(bool relayoutChildren) |
| 219 { | 219 { |
| 220 ASSERT(needsLayout()); | 220 ASSERT(needsLayout()); |
| 221 | 221 |
| 222 if (!relayoutChildren && simplifiedLayout()) | 222 if (!relayoutChildren && simplifiedLayout()) |
| 223 return; | 223 return; |
| (...skipping 804 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1028 if (isOutOfFlowPositioned()) | 1028 if (isOutOfFlowPositioned()) |
| 1029 return "RenderDeprecatedFlexibleBox (positioned)"; | 1029 return "RenderDeprecatedFlexibleBox (positioned)"; |
| 1030 if (isAnonymous()) | 1030 if (isAnonymous()) |
| 1031 return "RenderDeprecatedFlexibleBox (generated)"; | 1031 return "RenderDeprecatedFlexibleBox (generated)"; |
| 1032 if (isRelPositioned()) | 1032 if (isRelPositioned()) |
| 1033 return "RenderDeprecatedFlexibleBox (relative positioned)"; | 1033 return "RenderDeprecatedFlexibleBox (relative positioned)"; |
| 1034 return "RenderDeprecatedFlexibleBox"; | 1034 return "RenderDeprecatedFlexibleBox"; |
| 1035 } | 1035 } |
| 1036 | 1036 |
| 1037 } // namespace blink | 1037 } // namespace blink |
| OLD | NEW |