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 1108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1119 it->value.clearReset(); | 1119 it->value.clearReset(); |
1120 } | 1120 } |
1121 | 1121 |
1122 const AtomicString& ComputedStyle::hyphenString() const | 1122 const AtomicString& ComputedStyle::hyphenString() const |
1123 { | 1123 { |
1124 const AtomicString& hyphenationString = rareInheritedData.get()->hyphenation
String; | 1124 const AtomicString& hyphenationString = rareInheritedData.get()->hyphenation
String; |
1125 if (!hyphenationString.isNull()) | 1125 if (!hyphenationString.isNull()) |
1126 return hyphenationString; | 1126 return hyphenationString; |
1127 | 1127 |
1128 // FIXME: This should depend on locale. | 1128 // FIXME: This should depend on locale. |
1129 DEFINE_STATIC_LOCAL(AtomicString, hyphenMinusString, (&hyphenMinus, 1)); | 1129 DEFINE_STATIC_LOCAL(AtomicString, hyphenMinusString, (&hyphenMinusCharacter,
1)); |
1130 DEFINE_STATIC_LOCAL(AtomicString, hyphenString, (&hyphen, 1)); | 1130 DEFINE_STATIC_LOCAL(AtomicString, hyphenString, (&hyphenCharacter, 1)); |
1131 return font().primaryFontHasGlyphForCharacter(hyphen) ? hyphenString : hyphe
nMinusString; | 1131 return font().primaryFontHasGlyphForCharacter(hyphenCharacter) ? hyphenStrin
g : hyphenMinusString; |
1132 } | 1132 } |
1133 | 1133 |
1134 const AtomicString& ComputedStyle::textEmphasisMarkString() const | 1134 const AtomicString& ComputedStyle::textEmphasisMarkString() const |
1135 { | 1135 { |
1136 switch (textEmphasisMark()) { | 1136 switch (textEmphasisMark()) { |
1137 case TextEmphasisMarkNone: | 1137 case TextEmphasisMarkNone: |
1138 return nullAtom; | 1138 return nullAtom; |
1139 case TextEmphasisMarkCustom: | 1139 case TextEmphasisMarkCustom: |
1140 return textEmphasisCustomMark(); | 1140 return textEmphasisCustomMark(); |
1141 case TextEmphasisMarkDot: { | 1141 case TextEmphasisMarkDot: { |
1142 DEFINE_STATIC_LOCAL(AtomicString, filledDotString, (&bullet, 1)); | 1142 DEFINE_STATIC_LOCAL(AtomicString, filledDotString, (&bulletCharacter, 1)
); |
1143 DEFINE_STATIC_LOCAL(AtomicString, openDotString, (&whiteBullet, 1)); | 1143 DEFINE_STATIC_LOCAL(AtomicString, openDotString, (&whiteBulletCharacter,
1)); |
1144 return textEmphasisFill() == TextEmphasisFillFilled ? filledDotString :
openDotString; | 1144 return textEmphasisFill() == TextEmphasisFillFilled ? filledDotString :
openDotString; |
1145 } | 1145 } |
1146 case TextEmphasisMarkCircle: { | 1146 case TextEmphasisMarkCircle: { |
1147 DEFINE_STATIC_LOCAL(AtomicString, filledCircleString, (&blackCircle, 1))
; | 1147 DEFINE_STATIC_LOCAL(AtomicString, filledCircleString, (&blackCircleChara
cter, 1)); |
1148 DEFINE_STATIC_LOCAL(AtomicString, openCircleString, (&whiteCircle, 1)); | 1148 DEFINE_STATIC_LOCAL(AtomicString, openCircleString, (&whiteCircleCharact
er, 1)); |
1149 return textEmphasisFill() == TextEmphasisFillFilled ? filledCircleString
: openCircleString; | 1149 return textEmphasisFill() == TextEmphasisFillFilled ? filledCircleString
: openCircleString; |
1150 } | 1150 } |
1151 case TextEmphasisMarkDoubleCircle: { | 1151 case TextEmphasisMarkDoubleCircle: { |
1152 DEFINE_STATIC_LOCAL(AtomicString, filledDoubleCircleString, (&fisheye, 1
)); | 1152 DEFINE_STATIC_LOCAL(AtomicString, filledDoubleCircleString, (&fisheyeCha
racter, 1)); |
1153 DEFINE_STATIC_LOCAL(AtomicString, openDoubleCircleString, (&bullseye, 1)
); | 1153 DEFINE_STATIC_LOCAL(AtomicString, openDoubleCircleString, (&bullseyeChar
acter, 1)); |
1154 return textEmphasisFill() == TextEmphasisFillFilled ? filledDoubleCircle
String : openDoubleCircleString; | 1154 return textEmphasisFill() == TextEmphasisFillFilled ? filledDoubleCircle
String : openDoubleCircleString; |
1155 } | 1155 } |
1156 case TextEmphasisMarkTriangle: { | 1156 case TextEmphasisMarkTriangle: { |
1157 DEFINE_STATIC_LOCAL(AtomicString, filledTriangleString, (&blackUpPointin
gTriangle, 1)); | 1157 DEFINE_STATIC_LOCAL(AtomicString, filledTriangleString, (&blackUpPointin
gTriangleCharacter, 1)); |
1158 DEFINE_STATIC_LOCAL(AtomicString, openTriangleString, (&whiteUpPointingT
riangle, 1)); | 1158 DEFINE_STATIC_LOCAL(AtomicString, openTriangleString, (&whiteUpPointingT
riangleCharacter, 1)); |
1159 return textEmphasisFill() == TextEmphasisFillFilled ? filledTriangleStri
ng : openTriangleString; | 1159 return textEmphasisFill() == TextEmphasisFillFilled ? filledTriangleStri
ng : openTriangleString; |
1160 } | 1160 } |
1161 case TextEmphasisMarkSesame: { | 1161 case TextEmphasisMarkSesame: { |
1162 DEFINE_STATIC_LOCAL(AtomicString, filledSesameString, (&sesameDot, 1)); | 1162 DEFINE_STATIC_LOCAL(AtomicString, filledSesameString, (&sesameDotCharact
er, 1)); |
1163 DEFINE_STATIC_LOCAL(AtomicString, openSesameString, (&whiteSesameDot, 1)
); | 1163 DEFINE_STATIC_LOCAL(AtomicString, openSesameString, (&whiteSesameDotChar
acter, 1)); |
1164 return textEmphasisFill() == TextEmphasisFillFilled ? filledSesameString
: openSesameString; | 1164 return textEmphasisFill() == TextEmphasisFillFilled ? filledSesameString
: openSesameString; |
1165 } | 1165 } |
1166 case TextEmphasisMarkAuto: | 1166 case TextEmphasisMarkAuto: |
1167 ASSERT_NOT_REACHED(); | 1167 ASSERT_NOT_REACHED(); |
1168 return nullAtom; | 1168 return nullAtom; |
1169 } | 1169 } |
1170 | 1170 |
1171 ASSERT_NOT_REACHED(); | 1171 ASSERT_NOT_REACHED(); |
1172 return nullAtom; | 1172 return nullAtom; |
1173 } | 1173 } |
(...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1729 horizontal || includeLogicalRightEdge); | 1729 horizontal || includeLogicalRightEdge); |
1730 | 1730 |
1731 edges[BSLeft] = BorderEdge(borderLeftWidth(), | 1731 edges[BSLeft] = BorderEdge(borderLeftWidth(), |
1732 visitedDependentColor(CSSPropertyBorderLeftColor), | 1732 visitedDependentColor(CSSPropertyBorderLeftColor), |
1733 borderLeftStyle(), | 1733 borderLeftStyle(), |
1734 borderLeftIsTransparent(), | 1734 borderLeftIsTransparent(), |
1735 !horizontal || includeLogicalLeftEdge); | 1735 !horizontal || includeLogicalLeftEdge); |
1736 } | 1736 } |
1737 | 1737 |
1738 } // namespace blink | 1738 } // namespace blink |
OLD | NEW |