| 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 1762 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1773 } | 1773 } |
| 1774 | 1774 |
| 1775 // If layout is limited to a subtree, the subtree root's logical width does
not change. | 1775 // If layout is limited to a subtree, the subtree root's logical width does
not change. |
| 1776 if (node() && view()->frameView() && view()->frameView()->layoutRoot(true) =
= this) | 1776 if (node() && view()->frameView() && view()->frameView()->layoutRoot(true) =
= this) |
| 1777 return; | 1777 return; |
| 1778 | 1778 |
| 1779 // The parent box is flexing us, so it has increased or decreased our | 1779 // The parent box is flexing us, so it has increased or decreased our |
| 1780 // width. Use the width from the style context. | 1780 // width. Use the width from the style context. |
| 1781 // FIXME: Account for block-flow in flexible boxes. | 1781 // FIXME: Account for block-flow in flexible boxes. |
| 1782 // https://bugs.webkit.org/show_bug.cgi?id=46418 | 1782 // https://bugs.webkit.org/show_bug.cgi?id=46418 |
| 1783 if (hasOverrideWidth() && (style()->borderFit() == BorderFitLines || parent(
)->isFlexibleBox())) { | 1783 if (hasOverrideWidth() && parent()->isFlexibleBox()) { |
| 1784 computedValues.m_extent = overrideLogicalContentWidth() + borderAndPaddi
ngLogicalWidth(); | 1784 computedValues.m_extent = overrideLogicalContentWidth() + borderAndPaddi
ngLogicalWidth(); |
| 1785 return; | 1785 return; |
| 1786 } | 1786 } |
| 1787 | 1787 |
| 1788 bool treatAsReplaced = shouldComputeSizeAsReplaced(); | 1788 bool treatAsReplaced = shouldComputeSizeAsReplaced(); |
| 1789 | 1789 |
| 1790 RenderStyle* styleToUse = style(); | 1790 RenderStyle* styleToUse = style(); |
| 1791 Length logicalWidthLength = treatAsReplaced ? Length(computeReplacedLogicalW
idth(), Fixed) : styleToUse->logicalWidth(); | 1791 Length logicalWidthLength = treatAsReplaced ? Length(computeReplacedLogicalW
idth(), Fixed) : styleToUse->logicalWidth(); |
| 1792 | 1792 |
| 1793 RenderBlock* cb = containingBlock(); | 1793 RenderBlock* cb = containingBlock(); |
| (...skipping 2183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3977 | 3977 |
| 3978 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style) | 3978 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style) |
| 3979 { | 3979 { |
| 3980 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor); | 3980 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor); |
| 3981 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage(); | 3981 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage(); |
| 3982 ASSERT(hasBackground == style.hasBackground()); | 3982 ASSERT(hasBackground == style.hasBackground()); |
| 3983 hasBorder = style.hasBorder(); | 3983 hasBorder = style.hasBorder(); |
| 3984 } | 3984 } |
| 3985 | 3985 |
| 3986 } // namespace blink | 3986 } // namespace blink |
| OLD | NEW |