| 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 2022 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2033 return computeIntrinsicLogicalWidthUsing(logicalWidth, cw, borde
rAndPaddingLogicalWidth()) - borderAndPaddingLogicalWidth(); | 2033 return computeIntrinsicLogicalWidthUsing(logicalWidth, cw, borde
rAndPaddingLogicalWidth()) - borderAndPaddingLogicalWidth(); |
| 2034 if (cw > 0 || (!cw && (containerLogicalWidth.isFixed() || containerL
ogicalWidth.isPercent()))) | 2034 if (cw > 0 || (!cw && (containerLogicalWidth.isFixed() || containerL
ogicalWidth.isPercent()))) |
| 2035 return adjustContentBoxLogicalWidthForBoxSizing(minimumValueForL
ength(logicalWidth, cw)); | 2035 return adjustContentBoxLogicalWidthForBoxSizing(minimumValueForL
ength(logicalWidth, cw)); |
| 2036 return 0; | 2036 return 0; |
| 2037 } | 2037 } |
| 2038 case Intrinsic: | 2038 case Intrinsic: |
| 2039 case MinIntrinsic: | 2039 case MinIntrinsic: |
| 2040 case Auto: | 2040 case Auto: |
| 2041 case MaxSizeNone: | 2041 case MaxSizeNone: |
| 2042 return intrinsicLogicalWidth(); | 2042 return intrinsicLogicalWidth(); |
| 2043 case ExtendToZoom: | |
| 2044 case DeviceWidth: | 2043 case DeviceWidth: |
| 2045 case DeviceHeight: | 2044 case DeviceHeight: |
| 2046 break; | 2045 break; |
| 2047 } | 2046 } |
| 2048 | 2047 |
| 2049 ASSERT_NOT_REACHED(); | 2048 ASSERT_NOT_REACHED(); |
| 2050 return 0; | 2049 return 0; |
| 2051 } | 2050 } |
| 2052 | 2051 |
| 2053 LayoutUnit RenderBox::computeReplacedLogicalHeight() const | 2052 LayoutUnit RenderBox::computeReplacedLogicalHeight() const |
| (...skipping 1676 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3730 | 3729 |
| 3731 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style) | 3730 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style) |
| 3732 { | 3731 { |
| 3733 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor); | 3732 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor); |
| 3734 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage(); | 3733 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage(); |
| 3735 ASSERT(hasBackground == style.hasBackground()); | 3734 ASSERT(hasBackground == style.hasBackground()); |
| 3736 hasBorder = style.hasBorder(); | 3735 hasBorder = style.hasBorder(); |
| 3737 } | 3736 } |
| 3738 | 3737 |
| 3739 } // namespace blink | 3738 } // namespace blink |
| OLD | NEW |