| 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 4204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4215 | 4215 |
| 4216 if (m_rareData && m_rareData->m_previousBorderBoxSize.width() != -1) | 4216 if (m_rareData && m_rareData->m_previousBorderBoxSize.width() != -1) |
| 4217 return m_rareData->m_previousBorderBoxSize; | 4217 return m_rareData->m_previousBorderBoxSize; |
| 4218 | 4218 |
| 4219 // We didn't save the old border box size because it was the same as the siz
e of oldBounds. | 4219 // We didn't save the old border box size because it was the same as the siz
e of oldBounds. |
| 4220 return previousBoundsSize; | 4220 return previousBoundsSize; |
| 4221 } | 4221 } |
| 4222 | 4222 |
| 4223 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style) | 4223 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style) |
| 4224 { | 4224 { |
| 4225 backgroundColor = style.visitedDependentColor(CSSPropertyBackgroundColor); | 4225 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor); |
| 4226 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage(); | 4226 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage(); |
| 4227 ASSERT(hasBackground == style.hasBackground()); | 4227 ASSERT(hasBackground == style.hasBackground()); |
| 4228 hasBorder = style.hasBorder(); | 4228 hasBorder = style.hasBorder(); |
| 4229 } | 4229 } |
| 4230 | 4230 |
| 4231 } // namespace blink | 4231 } // namespace blink |
| OLD | NEW |