Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: Source/core/style/ComputedStyle.cpp

Issue 1130913007: Removing primaryFontHasGlyphForCharacter method (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase patch Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | Source/platform/fonts/Font.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1110 matching lines...) Expand 10 before | Expand all | Expand 10 after
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, (&hyphenMinusCharacter, 1)); 1129 DEFINE_STATIC_LOCAL(AtomicString, hyphenMinusString, (&hyphenMinusCharacter, 1));
1130 DEFINE_STATIC_LOCAL(AtomicString, hyphenString, (&hyphenCharacter, 1)); 1130 DEFINE_STATIC_LOCAL(AtomicString, hyphenString, (&hyphenCharacter, 1));
1131 return font().primaryFontHasGlyphForCharacter(hyphenCharacter) ? hyphenStrin g : hyphenMinusString; 1131 const SimpleFontData* primaryFont = font().primaryFont();
1132 ASSERT(primaryFont);
1133 return primaryFont->glyphForCharacter(hyphenCharacter) ? hyphenString : hyph enMinusString;
1132 } 1134 }
1133 1135
1134 const AtomicString& ComputedStyle::textEmphasisMarkString() const 1136 const AtomicString& ComputedStyle::textEmphasisMarkString() const
1135 { 1137 {
1136 switch (textEmphasisMark()) { 1138 switch (textEmphasisMark()) {
1137 case TextEmphasisMarkNone: 1139 case TextEmphasisMarkNone:
1138 return nullAtom; 1140 return nullAtom;
1139 case TextEmphasisMarkCustom: 1141 case TextEmphasisMarkCustom:
1140 return textEmphasisCustomMark(); 1142 return textEmphasisCustomMark();
1141 case TextEmphasisMarkDot: { 1143 case TextEmphasisMarkDot: {
(...skipping 594 matching lines...) Expand 10 before | Expand all | Expand 10 after
1736 } 1738 }
1737 1739
1738 void ComputedStyle::copyChildDependentFlagsFrom(const ComputedStyle& other) 1740 void ComputedStyle::copyChildDependentFlagsFrom(const ComputedStyle& other)
1739 { 1741 {
1740 setEmptyState(other.emptyState()); 1742 setEmptyState(other.emptyState());
1741 if (other.hasExplicitlyInheritedProperties()) 1743 if (other.hasExplicitlyInheritedProperties())
1742 setHasExplicitlyInheritedProperties(); 1744 setHasExplicitlyInheritedProperties();
1743 } 1745 }
1744 1746
1745 } // namespace blink 1747 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/platform/fonts/Font.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698