OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) | 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) |
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights |
4 * reserved. | 4 * reserved. |
5 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. | 5 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. |
6 * | 6 * |
7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
(...skipping 1710 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1721 decorations |= applied[i].lines(); | 1721 decorations |= applied[i].lines(); |
1722 | 1722 |
1723 return static_cast<TextDecoration>(decorations); | 1723 return static_cast<TextDecoration>(decorations); |
1724 } | 1724 } |
1725 | 1725 |
1726 const Vector<AppliedTextDecoration>& ComputedStyle::appliedTextDecorations() | 1726 const Vector<AppliedTextDecoration>& ComputedStyle::appliedTextDecorations() |
1727 const { | 1727 const { |
1728 if (m_inheritedData.m_hasSimpleUnderline) { | 1728 if (m_inheritedData.m_hasSimpleUnderline) { |
1729 DEFINE_STATIC_LOCAL( | 1729 DEFINE_STATIC_LOCAL( |
1730 Vector<AppliedTextDecoration>, underline, | 1730 Vector<AppliedTextDecoration>, underline, |
1731 (1, AppliedTextDecoration( | 1731 (1, |
1732 TextDecorationUnderline, TextDecorationStyleSolid, | 1732 AppliedTextDecoration( |
1733 visitedDependentColor(CSSPropertyTextDecorationColor)))); | 1733 TextDecorationUnderline, TextDecorationStyleSolid, |
| 1734 visitedDependentColor(CSSPropertyTextDecorationColor)))); |
1734 // Since we only have one of these in memory, just update the color before | 1735 // Since we only have one of these in memory, just update the color before |
1735 // returning. | 1736 // returning. |
1736 underline.at(0).setColor( | 1737 underline.at(0).setColor( |
1737 visitedDependentColor(CSSPropertyTextDecorationColor)); | 1738 visitedDependentColor(CSSPropertyTextDecorationColor)); |
1738 return underline; | 1739 return underline; |
1739 } | 1740 } |
1740 if (!m_rareInheritedData->appliedTextDecorations) { | 1741 if (!m_rareInheritedData->appliedTextDecorations) { |
1741 DEFINE_STATIC_LOCAL(Vector<AppliedTextDecoration>, empty, ()); | 1742 DEFINE_STATIC_LOCAL(Vector<AppliedTextDecoration>, empty, ()); |
1742 return empty; | 1743 return empty; |
1743 } | 1744 } |
(...skipping 726 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2470 if (value < 0) | 2471 if (value < 0) |
2471 fvalue -= 0.5f; | 2472 fvalue -= 0.5f; |
2472 else | 2473 else |
2473 fvalue += 0.5f; | 2474 fvalue += 0.5f; |
2474 } | 2475 } |
2475 | 2476 |
2476 return roundForImpreciseConversion<int>(fvalue / zoomFactor); | 2477 return roundForImpreciseConversion<int>(fvalue / zoomFactor); |
2477 } | 2478 } |
2478 | 2479 |
2479 } // namespace blink | 2480 } // namespace blink |
OLD | NEW |