| OLD | NEW |
| 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) 2005 Allan Sandfeld Jensen (kde@carewolf.com) | 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) |
| 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) | 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) |
| 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv
ed. | 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv
ed. |
| 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 2166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2177 case ViewportPercentageWidth: | 2177 case ViewportPercentageWidth: |
| 2178 case ViewportPercentageHeight: | 2178 case ViewportPercentageHeight: |
| 2179 case ViewportPercentageMin: | 2179 case ViewportPercentageMin: |
| 2180 return computeContentBoxLogicalWidth(valueForLength(logicalWidth, 0,
view())); | 2180 return computeContentBoxLogicalWidth(valueForLength(logicalWidth, 0,
view())); |
| 2181 case Percent: | 2181 case Percent: |
| 2182 case Calculated: { | 2182 case Calculated: { |
| 2183 // FIXME: containingBlockLogicalWidthForContent() is wrong if the re
placed element's block-flow is perpendicular to the | 2183 // FIXME: containingBlockLogicalWidthForContent() is wrong if the re
placed element's block-flow is perpendicular to the |
| 2184 // containing block's block-flow. | 2184 // containing block's block-flow. |
| 2185 // https://bugs.webkit.org/show_bug.cgi?id=46496 | 2185 // https://bugs.webkit.org/show_bug.cgi?id=46496 |
| 2186 const LayoutUnit cw = isOutOfFlowPositioned() ? containingBlockLogic
alWidthForPositioned(toRenderBoxModelObject(container())) : containingBlockLogic
alWidthForContent(); | 2186 const LayoutUnit cw = isOutOfFlowPositioned() ? containingBlockLogic
alWidthForPositioned(toRenderBoxModelObject(container())) : containingBlockLogic
alWidthForContent(); |
| 2187 Length containerLogicalWidth = containingBlock()->style()->logicalWi
dth(); | 2187 if (cw > 0) |
| 2188 // FIXME: Handle cases when containing block width is calculated or
viewport percent. | |
| 2189 // https://bugs.webkit.org/show_bug.cgi?id=91071 | |
| 2190 if (cw > 0 || (!cw && (containerLogicalWidth.isFixed() || containerL
ogicalWidth.isPercent()))) | |
| 2191 return computeContentBoxLogicalWidth(minimumValueForLength(logic
alWidth, cw)); | 2188 return computeContentBoxLogicalWidth(minimumValueForLength(logic
alWidth, cw)); |
| 2192 } | 2189 } |
| 2193 // fall through | 2190 // fall through |
| 2194 default: | 2191 default: |
| 2195 return intrinsicLogicalWidth(); | 2192 return intrinsicLogicalWidth(); |
| 2196 } | 2193 } |
| 2197 } | 2194 } |
| 2198 | 2195 |
| 2199 LayoutUnit RenderBox::computeReplacedLogicalHeight() const | 2196 LayoutUnit RenderBox::computeReplacedLogicalHeight() const |
| 2200 { | 2197 { |
| (...skipping 1809 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4010 } | 4007 } |
| 4011 | 4008 |
| 4012 if (didSplitParentAnonymousBoxes) | 4009 if (didSplitParentAnonymousBoxes) |
| 4013 markBoxForRelayoutAfterSplit(this); | 4010 markBoxForRelayoutAfterSplit(this); |
| 4014 | 4011 |
| 4015 ASSERT(beforeChild->parent() == this); | 4012 ASSERT(beforeChild->parent() == this); |
| 4016 return beforeChild; | 4013 return beforeChild; |
| 4017 } | 4014 } |
| 4018 | 4015 |
| 4019 } // namespace WebCore | 4016 } // namespace WebCore |
| OLD | NEW |