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) 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. All rights reserved. | 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. |
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
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 5755 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
5766 void RenderBlock::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Lay outUnit& maxLogicalWidth) const | 5766 void RenderBlock::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Lay outUnit& maxLogicalWidth) const |
5767 { | 5767 { |
5768 if (childrenInline()) { | 5768 if (childrenInline()) { |
5769 // FIXME: Remove this const_cast. | 5769 // FIXME: Remove this const_cast. |
5770 const_cast<RenderBlock*>(this)->computeInlinePreferredLogicalWidths(minL ogicalWidth, maxLogicalWidth); | 5770 const_cast<RenderBlock*>(this)->computeInlinePreferredLogicalWidths(minL ogicalWidth, maxLogicalWidth); |
5771 } else | 5771 } else |
5772 computeBlockPreferredLogicalWidths(minLogicalWidth, maxLogicalWidth); | 5772 computeBlockPreferredLogicalWidths(minLogicalWidth, maxLogicalWidth); |
5773 | 5773 |
5774 maxLogicalWidth = max(minLogicalWidth, maxLogicalWidth); | 5774 maxLogicalWidth = max(minLogicalWidth, maxLogicalWidth); |
5775 | 5775 |
5776 if (!style()->autoWrap() && childrenInline()) { | 5776 // A horizontal marquee with inline children has no minimum width. |
5777 minLogicalWidth = maxLogicalWidth; | 5777 if (childrenInline() && isMarquee() && toRenderMarquee(this)->isHorizontal() ) |
esprehn
2013/06/18 02:10:03
This change doesn't look related to this patch and
ojan
2013/06/18 03:33:46
It's removing the minLogicalWidth = maxLogicalWidt
| |
5778 // A horizontal marquee with inline children has no minimum width. | 5778 minLogicalWidth = 0; |
5779 if (isMarquee() && toRenderMarquee(this)->isHorizontal()) | |
5780 minLogicalWidth = 0; | |
5781 } | |
5782 | 5779 |
5783 if (isTableCell()) { | 5780 if (isTableCell()) { |
5784 Length tableCellWidth = toRenderTableCell(this)->styleOrColLogicalWidth( ); | 5781 Length tableCellWidth = toRenderTableCell(this)->styleOrColLogicalWidth( ); |
5785 if (tableCellWidth.isFixed() && tableCellWidth.value() > 0) | 5782 if (tableCellWidth.isFixed() && tableCellWidth.value() > 0) |
5786 maxLogicalWidth = max(minLogicalWidth, adjustContentBoxLogicalWidthF orBoxSizing(tableCellWidth.value())); | 5783 maxLogicalWidth = max(minLogicalWidth, adjustContentBoxLogicalWidthF orBoxSizing(tableCellWidth.value())); |
5787 } | 5784 } |
5788 | 5785 |
5789 int scrollbarWidth = instrinsicScrollbarLogicalWidth(); | 5786 int scrollbarWidth = instrinsicScrollbarLogicalWidth(); |
5790 maxLogicalWidth += scrollbarWidth; | 5787 maxLogicalWidth += scrollbarWidth; |
5791 minLogicalWidth += scrollbarWidth; | 5788 minLogicalWidth += scrollbarWidth; |
(...skipping 2320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
8112 { | 8109 { |
8113 memoryInstrumentation->addRootObject(gColumnInfoMap, WebCoreMemoryTypes::Ren deringStructures); | 8110 memoryInstrumentation->addRootObject(gColumnInfoMap, WebCoreMemoryTypes::Ren deringStructures); |
8114 memoryInstrumentation->addRootObject(gPositionedDescendantsMap, WebCoreMemor yTypes::RenderingStructures); | 8111 memoryInstrumentation->addRootObject(gPositionedDescendantsMap, WebCoreMemor yTypes::RenderingStructures); |
8115 memoryInstrumentation->addRootObject(gPercentHeightDescendantsMap, WebCoreMe moryTypes::RenderingStructures); | 8112 memoryInstrumentation->addRootObject(gPercentHeightDescendantsMap, WebCoreMe moryTypes::RenderingStructures); |
8116 memoryInstrumentation->addRootObject(gPositionedContainerMap, WebCoreMemoryT ypes::RenderingStructures); | 8113 memoryInstrumentation->addRootObject(gPositionedContainerMap, WebCoreMemoryT ypes::RenderingStructures); |
8117 memoryInstrumentation->addRootObject(gPercentHeightContainerMap, WebCoreMemo ryTypes::RenderingStructures); | 8114 memoryInstrumentation->addRootObject(gPercentHeightContainerMap, WebCoreMemo ryTypes::RenderingStructures); |
8118 memoryInstrumentation->addRootObject(gDelayedUpdateScrollInfoSet, WebCoreMem oryTypes::RenderingStructures); | 8115 memoryInstrumentation->addRootObject(gDelayedUpdateScrollInfoSet, WebCoreMem oryTypes::RenderingStructures); |
8119 } | 8116 } |
8120 | 8117 |
8121 } // namespace WebCore | 8118 } // namespace WebCore |
OLD | NEW |