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 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. | 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. |
8 * | 8 * |
9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
10 * modify it under the terms of the GNU Library General Public | 10 * modify it under the terms of the GNU Library General Public |
(...skipping 2164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2175 // https://bugs.webkit.org/show_bug.cgi?id=46418 | 2175 // https://bugs.webkit.org/show_bug.cgi?id=46418 |
2176 bool inHorizontalBox = parent()->isDeprecatedFlexibleBox() && parent()->
style()->boxOrient() == HORIZONTAL; | 2176 bool inHorizontalBox = parent()->isDeprecatedFlexibleBox() && parent()->
style()->boxOrient() == HORIZONTAL; |
2177 bool stretching = parent()->style()->boxAlign() == BSTRETCH; | 2177 bool stretching = parent()->style()->boxAlign() == BSTRETCH; |
2178 bool treatAsReplaced = shouldComputeSizeAsReplaced() && (!inHorizontalBo
x || !stretching); | 2178 bool treatAsReplaced = shouldComputeSizeAsReplaced() && (!inHorizontalBo
x || !stretching); |
2179 bool checkMinMaxHeight = false; | 2179 bool checkMinMaxHeight = false; |
2180 | 2180 |
2181 // The parent box is flexing us, so it has increased or decreased our he
ight. We have to | 2181 // The parent box is flexing us, so it has increased or decreased our he
ight. We have to |
2182 // grab our cached flexible height. | 2182 // grab our cached flexible height. |
2183 // FIXME: Account for block-flow in flexible boxes. | 2183 // FIXME: Account for block-flow in flexible boxes. |
2184 // https://bugs.webkit.org/show_bug.cgi?id=46418 | 2184 // https://bugs.webkit.org/show_bug.cgi?id=46418 |
2185 if (hasOverrideHeight() && parent()->isFlexibleBoxIncludingDeprecated()) | 2185 if (hasOverrideHeight() && (parent()->isFlexibleBoxIncludingDeprecated()
|| parent()->isRenderGrid())) |
2186 h = Length(overrideLogicalContentHeight(), Fixed); | 2186 h = Length(overrideLogicalContentHeight(), Fixed); |
2187 else if (treatAsReplaced) | 2187 else if (treatAsReplaced) |
2188 h = Length(computeReplacedLogicalHeight(), Fixed); | 2188 h = Length(computeReplacedLogicalHeight(), Fixed); |
2189 else { | 2189 else { |
2190 h = style()->logicalHeight(); | 2190 h = style()->logicalHeight(); |
2191 checkMinMaxHeight = true; | 2191 checkMinMaxHeight = true; |
2192 } | 2192 } |
2193 | 2193 |
2194 // Block children of horizontal flexible boxes fill the height of the bo
x. | 2194 // Block children of horizontal flexible boxes fill the height of the bo
x. |
2195 // FIXME: Account for block-flow in flexible boxes. | 2195 // FIXME: Account for block-flow in flexible boxes. |
(...skipping 2270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4466 ASSERT(style()->hasBackground() || style()->hasBoxDecorations()); | 4466 ASSERT(style()->hasBackground() || style()->hasBoxDecorations()); |
4467 | 4467 |
4468 if (m_rareData && m_rareData->m_previousBorderBoxSize.width() != -1) | 4468 if (m_rareData && m_rareData->m_previousBorderBoxSize.width() != -1) |
4469 return m_rareData->m_previousBorderBoxSize; | 4469 return m_rareData->m_previousBorderBoxSize; |
4470 | 4470 |
4471 // We didn't save the old border box size because it was the same as the siz
e of oldBounds. | 4471 // We didn't save the old border box size because it was the same as the siz
e of oldBounds. |
4472 return previousBoundsSize; | 4472 return previousBoundsSize; |
4473 } | 4473 } |
4474 | 4474 |
4475 } // namespace blink | 4475 } // namespace blink |
OLD | NEW |