| 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 1207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1218 return empty; | 1218 return empty; |
| 1219 } | 1219 } |
| 1220 if (inherited_flags.m_textUnderline) { | 1220 if (inherited_flags.m_textUnderline) { |
| 1221 DEFINE_STATIC_LOCAL(Vector<AppliedTextDecoration>, underline, (1, Applie
dTextDecoration(TextDecorationUnderline))); | 1221 DEFINE_STATIC_LOCAL(Vector<AppliedTextDecoration>, underline, (1, Applie
dTextDecoration(TextDecorationUnderline))); |
| 1222 return underline; | 1222 return underline; |
| 1223 } | 1223 } |
| 1224 | 1224 |
| 1225 return rareInheritedData->appliedTextDecorations->vector(); | 1225 return rareInheritedData->appliedTextDecorations->vector(); |
| 1226 } | 1226 } |
| 1227 | 1227 |
| 1228 void ComputedStyle::createVariables() |
| 1229 { |
| 1230 RefPtr<StyleVariableData>& variables = rareInheritedData.access()->variables
; |
| 1231 if (!variables) |
| 1232 variables = StyleVariableData::create(); |
| 1233 } |
| 1234 |
| 1235 StyleVariableData* ComputedStyle::variables() const |
| 1236 { |
| 1237 ASSERT(RuntimeEnabledFeatures::cssVariablesEnabled()); |
| 1238 return rareInheritedData->variables.get(); |
| 1239 } |
| 1240 |
| 1241 void ComputedStyle::setVariables(PassRefPtr<StyleVariableData> variableData) |
| 1242 { |
| 1243 rareInheritedData.access()->variables = variableData; |
| 1244 } |
| 1245 |
| 1228 float ComputedStyle::wordSpacing() const { return fontDescription().wordSpacing(
); } | 1246 float ComputedStyle::wordSpacing() const { return fontDescription().wordSpacing(
); } |
| 1229 float ComputedStyle::letterSpacing() const { return fontDescription().letterSpac
ing(); } | 1247 float ComputedStyle::letterSpacing() const { return fontDescription().letterSpac
ing(); } |
| 1230 | 1248 |
| 1231 bool ComputedStyle::setFontDescription(const FontDescription& v) | 1249 bool ComputedStyle::setFontDescription(const FontDescription& v) |
| 1232 { | 1250 { |
| 1233 if (inherited->font.fontDescription() != v) { | 1251 if (inherited->font.fontDescription() != v) { |
| 1234 inherited.access()->font = Font(v); | 1252 inherited.access()->font = Font(v); |
| 1235 return true; | 1253 return true; |
| 1236 } | 1254 } |
| 1237 return false; | 1255 return false; |
| (...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1738 } | 1756 } |
| 1739 | 1757 |
| 1740 void ComputedStyle::copyChildDependentFlagsFrom(const ComputedStyle& other) | 1758 void ComputedStyle::copyChildDependentFlagsFrom(const ComputedStyle& other) |
| 1741 { | 1759 { |
| 1742 setEmptyState(other.emptyState()); | 1760 setEmptyState(other.emptyState()); |
| 1743 if (other.hasExplicitlyInheritedProperties()) | 1761 if (other.hasExplicitlyInheritedProperties()) |
| 1744 setHasExplicitlyInheritedProperties(); | 1762 setHasExplicitlyInheritedProperties(); |
| 1745 } | 1763 } |
| 1746 | 1764 |
| 1747 } // namespace blink | 1765 } // namespace blink |
| OLD | NEW |