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 1882 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1893 } | 1893 } |
1894 | 1894 |
1895 // If layout is limited to a subtree, the subtree root's logical width does
not change. | 1895 // If layout is limited to a subtree, the subtree root's logical width does
not change. |
1896 if (node() && view()->frameView() && view()->frameView()->layoutRoot(true) =
= this) | 1896 if (node() && view()->frameView() && view()->frameView()->layoutRoot(true) =
= this) |
1897 return; | 1897 return; |
1898 | 1898 |
1899 // The parent box is flexing us, so it has increased or decreased our | 1899 // The parent box is flexing us, so it has increased or decreased our |
1900 // width. Use the width from the style context. | 1900 // width. Use the width from the style context. |
1901 // FIXME: Account for block-flow in flexible boxes. | 1901 // FIXME: Account for block-flow in flexible boxes. |
1902 // https://bugs.webkit.org/show_bug.cgi?id=46418 | 1902 // https://bugs.webkit.org/show_bug.cgi?id=46418 |
1903 if (hasOverrideWidth() && (style()->borderFit() == BorderFitLines || parent(
)->isFlexibleBoxIncludingDeprecated())) { | 1903 if (hasOverrideWidth() && parent()->isFlexibleBoxIncludingDeprecated()) { |
1904 computedValues.m_extent = overrideLogicalContentWidth() + borderAndPaddi
ngLogicalWidth(); | 1904 computedValues.m_extent = overrideLogicalContentWidth() + borderAndPaddi
ngLogicalWidth(); |
1905 return; | 1905 return; |
1906 } | 1906 } |
1907 | 1907 |
1908 // FIXME: Account for block-flow in flexible boxes. | 1908 // FIXME: Account for block-flow in flexible boxes. |
1909 // https://bugs.webkit.org/show_bug.cgi?id=46418 | 1909 // https://bugs.webkit.org/show_bug.cgi?id=46418 |
1910 bool inVerticalBox = parent()->isDeprecatedFlexibleBox() && (parent()->style
()->boxOrient() == VERTICAL); | 1910 bool inVerticalBox = parent()->isDeprecatedFlexibleBox() && (parent()->style
()->boxOrient() == VERTICAL); |
1911 bool stretching = (parent()->style()->boxAlign() == BSTRETCH); | 1911 bool stretching = (parent()->style()->boxAlign() == BSTRETCH); |
1912 bool treatAsReplaced = shouldComputeSizeAsReplaced() && (!inVerticalBox || !
stretching); | 1912 bool treatAsReplaced = shouldComputeSizeAsReplaced() && (!inVerticalBox || !
stretching); |
1913 | 1913 |
(...skipping 2609 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4523 ASSERT(style()->hasBackground() || style()->hasBoxDecorations()); | 4523 ASSERT(style()->hasBackground() || style()->hasBoxDecorations()); |
4524 | 4524 |
4525 if (m_rareData && m_rareData->m_previousBorderBoxSize.width() != -1) | 4525 if (m_rareData && m_rareData->m_previousBorderBoxSize.width() != -1) |
4526 return m_rareData->m_previousBorderBoxSize; | 4526 return m_rareData->m_previousBorderBoxSize; |
4527 | 4527 |
4528 // We didn't save the old border box size because it was the same as the siz
e of oldBounds. | 4528 // We didn't save the old border box size because it was the same as the siz
e of oldBounds. |
4529 return previousBoundsSize; | 4529 return previousBoundsSize; |
4530 } | 4530 } |
4531 | 4531 |
4532 } // namespace blink | 4532 } // namespace blink |
OLD | NEW |