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 1915 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1926 | 1926 |
1927 if (isOutOfFlowPositioned()) { | 1927 if (isOutOfFlowPositioned()) { |
1928 computePositionedLogicalWidth(computedValues); | 1928 computePositionedLogicalWidth(computedValues); |
1929 return; | 1929 return; |
1930 } | 1930 } |
1931 | 1931 |
1932 // The parent box is flexing us, so it has increased or decreased our | 1932 // The parent box is flexing us, so it has increased or decreased our |
1933 // width. Use the width from the style context. | 1933 // width. Use the width from the style context. |
1934 // FIXME: Account for writing-mode in flexible boxes. | 1934 // FIXME: Account for writing-mode in flexible boxes. |
1935 // https://bugs.webkit.org/show_bug.cgi?id=46418 | 1935 // https://bugs.webkit.org/show_bug.cgi?id=46418 |
1936 if (hasOverrideLogicalContentWidth() && parent()->isFlexibleBoxIncludingDepr
ecated()) { | 1936 if (hasOverrideLogicalContentWidth() && (parent()->isFlexibleBoxIncludingDep
recated() || parent()->isLayoutGrid())) { |
1937 computedValues.m_extent = overrideLogicalContentWidth() + borderAndPaddi
ngLogicalWidth(); | 1937 computedValues.m_extent = overrideLogicalContentWidth() + borderAndPaddi
ngLogicalWidth(); |
1938 return; | 1938 return; |
1939 } | 1939 } |
1940 | 1940 |
1941 // FIXME: Account for writing-mode in flexible boxes. | 1941 // FIXME: Account for writing-mode in flexible boxes. |
1942 // https://bugs.webkit.org/show_bug.cgi?id=46418 | 1942 // https://bugs.webkit.org/show_bug.cgi?id=46418 |
1943 bool inVerticalBox = parent()->isDeprecatedFlexibleBox() && (parent()->style
()->boxOrient() == VERTICAL); | 1943 bool inVerticalBox = parent()->isDeprecatedFlexibleBox() && (parent()->style
()->boxOrient() == VERTICAL); |
1944 bool stretching = (parent()->style()->boxAlign() == BSTRETCH); | 1944 bool stretching = (parent()->style()->boxAlign() == BSTRETCH); |
1945 bool treatAsReplaced = shouldComputeSizeAsReplaced() && (!inVerticalBox || !
stretching); | 1945 bool treatAsReplaced = shouldComputeSizeAsReplaced() && (!inVerticalBox || !
stretching); |
1946 | 1946 |
(...skipping 2838 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4785 StyleImage* borderImage = style()->borderImage().image(); | 4785 StyleImage* borderImage = style()->borderImage().image(); |
4786 return borderImage && borderImage->canRender(*this, style()->effectiveZoom()
) && borderImage->isLoaded(); | 4786 return borderImage && borderImage->canRender(*this, style()->effectiveZoom()
) && borderImage->isLoaded(); |
4787 } | 4787 } |
4788 | 4788 |
4789 ShapeOutsideInfo* LayoutBox::shapeOutsideInfo() const | 4789 ShapeOutsideInfo* LayoutBox::shapeOutsideInfo() const |
4790 { | 4790 { |
4791 return ShapeOutsideInfo::isEnabledFor(*this) ? ShapeOutsideInfo::info(*this)
: nullptr; | 4791 return ShapeOutsideInfo::isEnabledFor(*this) ? ShapeOutsideInfo::info(*this)
: nullptr; |
4792 } | 4792 } |
4793 | 4793 |
4794 } // namespace blink | 4794 } // namespace blink |
OLD | NEW |