| 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
reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
reserved. |
| 4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. | 4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. |
| 5 * | 5 * |
| 6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
| 8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
| 9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
| 10 * | 10 * |
| (...skipping 1291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1302 } | 1302 } |
| 1303 | 1303 |
| 1304 void RenderStyle::clearAppliedTextDecorations() | 1304 void RenderStyle::clearAppliedTextDecorations() |
| 1305 { | 1305 { |
| 1306 inherited_flags.m_textUnderline = false; | 1306 inherited_flags.m_textUnderline = false; |
| 1307 | 1307 |
| 1308 if (rareInheritedData->appliedTextDecorations) | 1308 if (rareInheritedData->appliedTextDecorations) |
| 1309 rareInheritedData.access()->appliedTextDecorations = nullptr; | 1309 rareInheritedData.access()->appliedTextDecorations = nullptr; |
| 1310 } | 1310 } |
| 1311 | 1311 |
| 1312 void RenderStyle::clearMultiCol() |
| 1313 { |
| 1314 rareNonInheritedData.access()->m_multiCol = nullptr; |
| 1315 rareNonInheritedData.access()->m_multiCol.init(); |
| 1316 } |
| 1317 |
| 1312 void RenderStyle::setFontStretch(FontStretch stretch) | 1318 void RenderStyle::setFontStretch(FontStretch stretch) |
| 1313 { | 1319 { |
| 1314 FontSelector* currentFontSelector = font().fontSelector(); | 1320 FontSelector* currentFontSelector = font().fontSelector(); |
| 1315 FontDescription desc(fontDescription()); | 1321 FontDescription desc(fontDescription()); |
| 1316 desc.setStretch(stretch); | 1322 desc.setStretch(stretch); |
| 1317 setFontDescription(desc); | 1323 setFontDescription(desc); |
| 1318 font().update(currentFontSelector); | 1324 font().update(currentFontSelector); |
| 1319 } | 1325 } |
| 1320 | 1326 |
| 1321 void RenderStyle::getShadowExtent(const ShadowList* shadowList, LayoutUnit &top,
LayoutUnit &right, LayoutUnit &bottom, LayoutUnit &left) const | 1327 void RenderStyle::getShadowExtent(const ShadowList* shadowList, LayoutUnit &top,
LayoutUnit &right, LayoutUnit &bottom, LayoutUnit &left) const |
| (...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1760 horizontal || includeLogicalRightEdge); | 1766 horizontal || includeLogicalRightEdge); |
| 1761 | 1767 |
| 1762 edges[BSLeft] = BorderEdge(borderLeftWidth(), | 1768 edges[BSLeft] = BorderEdge(borderLeftWidth(), |
| 1763 visitedDependentColor(CSSPropertyBorderLeftColor), | 1769 visitedDependentColor(CSSPropertyBorderLeftColor), |
| 1764 borderLeftStyle(), | 1770 borderLeftStyle(), |
| 1765 borderLeftIsTransparent(), | 1771 borderLeftIsTransparent(), |
| 1766 !horizontal || includeLogicalLeftEdge); | 1772 !horizontal || includeLogicalLeftEdge); |
| 1767 } | 1773 } |
| 1768 | 1774 |
| 1769 } // namespace blink | 1775 } // namespace blink |
| OLD | NEW |