Index: Source/core/style/ComputedStyle.cpp |
diff --git a/Source/core/style/ComputedStyle.cpp b/Source/core/style/ComputedStyle.cpp |
index 1172d7dbd57827c5bbce1677edf5b16fd7f25f48..b3335e1852430caba4fd869358682d6f7165da57 100644 |
--- a/Source/core/style/ComputedStyle.cpp |
+++ b/Source/core/style/ComputedStyle.cpp |
@@ -1133,9 +1133,9 @@ const AtomicString& ComputedStyle::hyphenString() const |
return hyphenationString; |
// FIXME: This should depend on locale. |
- DEFINE_STATIC_LOCAL(AtomicString, hyphenMinusString, (&hyphenMinus, 1)); |
- DEFINE_STATIC_LOCAL(AtomicString, hyphenString, (&hyphen, 1)); |
- return font().primaryFontHasGlyphForCharacter(hyphen) ? hyphenString : hyphenMinusString; |
+ DEFINE_STATIC_LOCAL(AtomicString, hyphenMinusString, (&characterHyphenMinus, 1)); |
+ DEFINE_STATIC_LOCAL(AtomicString, hyphenString, (&characterHyphen, 1)); |
+ return font().primaryFontHasGlyphForCharacter(characterHyphen) ? hyphenString : hyphenMinusString; |
} |
const AtomicString& ComputedStyle::textEmphasisMarkString() const |
@@ -1146,28 +1146,28 @@ const AtomicString& ComputedStyle::textEmphasisMarkString() const |
case TextEmphasisMarkCustom: |
return textEmphasisCustomMark(); |
case TextEmphasisMarkDot: { |
- DEFINE_STATIC_LOCAL(AtomicString, filledDotString, (&bullet, 1)); |
- DEFINE_STATIC_LOCAL(AtomicString, openDotString, (&whiteBullet, 1)); |
+ DEFINE_STATIC_LOCAL(AtomicString, filledDotString, (&characterBullet, 1)); |
+ DEFINE_STATIC_LOCAL(AtomicString, openDotString, (&characterWhiteBullet, 1)); |
return textEmphasisFill() == TextEmphasisFillFilled ? filledDotString : openDotString; |
} |
case TextEmphasisMarkCircle: { |
- DEFINE_STATIC_LOCAL(AtomicString, filledCircleString, (&blackCircle, 1)); |
- DEFINE_STATIC_LOCAL(AtomicString, openCircleString, (&whiteCircle, 1)); |
+ DEFINE_STATIC_LOCAL(AtomicString, filledCircleString, (&characterBlackCircle, 1)); |
+ DEFINE_STATIC_LOCAL(AtomicString, openCircleString, (&characterWhiteCircle, 1)); |
return textEmphasisFill() == TextEmphasisFillFilled ? filledCircleString : openCircleString; |
} |
case TextEmphasisMarkDoubleCircle: { |
- DEFINE_STATIC_LOCAL(AtomicString, filledDoubleCircleString, (&fisheye, 1)); |
- DEFINE_STATIC_LOCAL(AtomicString, openDoubleCircleString, (&bullseye, 1)); |
+ DEFINE_STATIC_LOCAL(AtomicString, filledDoubleCircleString, (&characterFisheye, 1)); |
+ DEFINE_STATIC_LOCAL(AtomicString, openDoubleCircleString, (&characterBullseye, 1)); |
return textEmphasisFill() == TextEmphasisFillFilled ? filledDoubleCircleString : openDoubleCircleString; |
} |
case TextEmphasisMarkTriangle: { |
- DEFINE_STATIC_LOCAL(AtomicString, filledTriangleString, (&blackUpPointingTriangle, 1)); |
- DEFINE_STATIC_LOCAL(AtomicString, openTriangleString, (&whiteUpPointingTriangle, 1)); |
+ DEFINE_STATIC_LOCAL(AtomicString, filledTriangleString, (&characterBlackUpPointingTriangle, 1)); |
+ DEFINE_STATIC_LOCAL(AtomicString, openTriangleString, (&characterWhiteUpPointingTriangle, 1)); |
return textEmphasisFill() == TextEmphasisFillFilled ? filledTriangleString : openTriangleString; |
} |
case TextEmphasisMarkSesame: { |
- DEFINE_STATIC_LOCAL(AtomicString, filledSesameString, (&sesameDot, 1)); |
- DEFINE_STATIC_LOCAL(AtomicString, openSesameString, (&whiteSesameDot, 1)); |
+ DEFINE_STATIC_LOCAL(AtomicString, filledSesameString, (&characterSesameDot, 1)); |
+ DEFINE_STATIC_LOCAL(AtomicString, openSesameString, (&characterWhiteSesameDot, 1)); |
return textEmphasisFill() == TextEmphasisFillFilled ? filledSesameString : openSesameString; |
} |
case TextEmphasisMarkAuto: |