| 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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 Length marginLeft = child->style()->marginLeft(); | 147 Length marginLeft = child->style()->marginLeft(); |
| 148 Length marginRight = child->style()->marginRight(); | 148 Length marginRight = child->style()->marginRight(); |
| 149 LayoutUnit margin = 0; | 149 LayoutUnit margin = 0; |
| 150 if (marginLeft.isFixed()) | 150 if (marginLeft.isFixed()) |
| 151 margin += marginLeft.value(); | 151 margin += marginLeft.value(); |
| 152 if (marginRight.isFixed()) | 152 if (marginRight.isFixed()) |
| 153 margin += marginRight.value(); | 153 margin += marginRight.value(); |
| 154 return margin; | 154 return margin; |
| 155 } | 155 } |
| 156 | 156 |
| 157 static bool childDoesNotAffectWidthOrFlexing(RenderObject* child) | 157 static bool childDoesNotAffectWidthOrFlexing(LayoutObject* child) |
| 158 { | 158 { |
| 159 // Positioned children and collapsed children don't affect the min/max width
. | 159 // Positioned children and collapsed children don't affect the min/max width
. |
| 160 return child->isOutOfFlowPositioned() || child->style()->visibility() == COL
LAPSE; | 160 return child->isOutOfFlowPositioned() || child->style()->visibility() == COL
LAPSE; |
| 161 } | 161 } |
| 162 | 162 |
| 163 static LayoutUnit contentWidthForChild(RenderBox* child) | 163 static LayoutUnit contentWidthForChild(RenderBox* child) |
| 164 { | 164 { |
| 165 if (child->hasOverrideWidth()) | 165 if (child->hasOverrideWidth()) |
| 166 return child->overrideLogicalContentWidth(); | 166 return child->overrideLogicalContentWidth(); |
| 167 return child->logicalWidth() - child->borderAndPaddingLogicalWidth(); | 167 return child->logicalWidth() - child->borderAndPaddingLogicalWidth(); |
| (...skipping 860 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 |