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

Side by Side Diff: Source/platform/fonts/Font.h

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 | « Source/core/style/ComputedStyle.cpp ('k') | Source/platform/fonts/Font.cpp » ('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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2006, 2007, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2006, 2007, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) 2008 Holger Hans Peter Freyther 6 * Copyright (C) 2008 Holger Hans Peter Freyther
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 float tabWidth(const TabSize& tabSize, float position) const { return tabWid th(*primaryFont(), tabSize, position); } 116 float tabWidth(const TabSize& tabSize, float position) const { return tabWid th(*primaryFont(), tabSize, position); }
117 117
118 int emphasisMarkAscent(const AtomicString&) const; 118 int emphasisMarkAscent(const AtomicString&) const;
119 int emphasisMarkDescent(const AtomicString&) const; 119 int emphasisMarkDescent(const AtomicString&) const;
120 int emphasisMarkHeight(const AtomicString&) const; 120 int emphasisMarkHeight(const AtomicString&) const;
121 121
122 const SimpleFontData* primaryFont() const; 122 const SimpleFontData* primaryFont() const;
123 const FontData* fontDataAt(unsigned) const; 123 const FontData* fontDataAt(unsigned) const;
124 124
125 GlyphData glyphDataForCharacter(UChar32&, bool mirror, bool normalizeSpace = false, FontDataVariant = AutoVariant) const; 125 GlyphData glyphDataForCharacter(UChar32&, bool mirror, bool normalizeSpace = false, FontDataVariant = AutoVariant) const;
126 bool primaryFontHasGlyphForCharacter(UChar32) const;
127
128 CodePath codePath(const TextRunPaintInfo&) const; 126 CodePath codePath(const TextRunPaintInfo&) const;
129 127
130 private: 128 private:
131 enum ForTextEmphasisOrNot { NotForTextEmphasis, ForTextEmphasis }; 129 enum ForTextEmphasisOrNot { NotForTextEmphasis, ForTextEmphasis };
132 130
133 // Returns the total advance. 131 // Returns the total advance.
134 float buildGlyphBuffer(const TextRunPaintInfo&, GlyphBuffer&, const GlyphDat a* emphasisData = nullptr) const; 132 float buildGlyphBuffer(const TextRunPaintInfo&, GlyphBuffer&, const GlyphDat a* emphasisData = nullptr) const;
135 PassTextBlobPtr buildTextBlob(const GlyphBuffer&) const; 133 PassTextBlobPtr buildTextBlob(const GlyphBuffer&) const;
136 void paintGlyphs(SkCanvas*, const SkPaint&, const SimpleFontData*, const Gly ph glyphs[], unsigned numGlyphs, 134 void paintGlyphs(SkCanvas*, const SkPaint&, const SimpleFontData*, const Gly ph glyphs[], unsigned numGlyphs,
137 const SkPoint pos[], const FloatRect& textRect, float deviceScaleFactor) const; 135 const SkPoint pos[], const FloatRect& textRect, float deviceScaleFactor) const;
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 // to the next tab stop is less than that, advance an additional tab stop. 201 // to the next tab stop is less than that, advance an additional tab stop.
204 if (distanceToTabStop < fontDescription().letterSpacing()) 202 if (distanceToTabStop < fontDescription().letterSpacing())
205 distanceToTabStop += baseTabWidth; 203 distanceToTabStop += baseTabWidth;
206 204
207 return distanceToTabStop; 205 return distanceToTabStop;
208 } 206 }
209 207
210 } // namespace blink 208 } // namespace blink
211 209
212 #endif 210 #endif
OLDNEW
« no previous file with comments | « Source/core/style/ComputedStyle.cpp ('k') | Source/platform/fonts/Font.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698