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

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

Issue 175253002: Switch to HarfBuzz on Mac and remove CoreText shaper (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fighting trunk TestExpectation changes Created 6 years, 2 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/platform/blink_platform.gypi ('k') | Source/platform/fonts/FontPlatformData.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) 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 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 int emphasisMarkAscent(const AtomicString&) const; 120 int emphasisMarkAscent(const AtomicString&) const;
121 int emphasisMarkDescent(const AtomicString&) const; 121 int emphasisMarkDescent(const AtomicString&) const;
122 int emphasisMarkHeight(const AtomicString&) const; 122 int emphasisMarkHeight(const AtomicString&) const;
123 123
124 const SimpleFontData* primaryFont() const; 124 const SimpleFontData* primaryFont() const;
125 const FontData* fontDataAt(unsigned) const; 125 const FontData* fontDataAt(unsigned) const;
126 inline GlyphData glyphDataForCharacter(UChar32& c, bool mirror, bool spaceNo rmalize = false, FontDataVariant variant = AutoVariant) const 126 inline GlyphData glyphDataForCharacter(UChar32& c, bool mirror, bool spaceNo rmalize = false, FontDataVariant variant = AutoVariant) const
127 { 127 {
128 return glyphDataAndPageForCharacter(c, mirror, spaceNormalize, variant). first; 128 return glyphDataAndPageForCharacter(c, mirror, spaceNormalize, variant). first;
129 } 129 }
130 #if OS(MACOSX) 130
131 const SimpleFontData* fontDataForCombiningCharacterSequence(const UChar*, si ze_t length, FontDataVariant) const;
132 #endif
133 std::pair<GlyphData, GlyphPage*> glyphDataAndPageForCharacter(UChar32&, bool mirror, bool normalizeSpace = false, FontDataVariant = AutoVariant) const; 131 std::pair<GlyphData, GlyphPage*> glyphDataAndPageForCharacter(UChar32&, bool mirror, bool normalizeSpace = false, FontDataVariant = AutoVariant) const;
134 bool primaryFontHasGlyphForCharacter(UChar32) const; 132 bool primaryFontHasGlyphForCharacter(UChar32) const;
135 133
136 CodePath codePath(const TextRun&) const; 134 CodePath codePath(const TextRun&) const;
137 135
138 PassTextBlobPtr buildTextBlob(const TextRunPaintInfo&, const FloatPoint& tex tOrigin, bool couldUseLCDRenderedText, CustomFontNotReadyAction = DoNotPaintIfFo ntNotReady) const; 136 PassTextBlobPtr buildTextBlob(const TextRunPaintInfo&, const FloatPoint& tex tOrigin, bool couldUseLCDRenderedText, CustomFontNotReadyAction = DoNotPaintIfFo ntNotReady) const;
139 void drawTextBlob(GraphicsContext*, const SkTextBlob*, const SkPoint& origin ) const; 137 void drawTextBlob(GraphicsContext*, const SkTextBlob*, const SkPoint& origin ) const;
140 138
141 private: 139 private:
142 enum ForTextEmphasisOrNot { NotForTextEmphasis, ForTextEmphasis }; 140 enum ForTextEmphasisOrNot { NotForTextEmphasis, ForTextEmphasis };
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 { 225 {
228 if (!tabSize) 226 if (!tabSize)
229 return fontDescription().letterSpacing(); 227 return fontDescription().letterSpacing();
230 float tabWidth = tabSize * fontData.spaceWidth() + fontDescription().letterS pacing(); 228 float tabWidth = tabSize * fontData.spaceWidth() + fontDescription().letterS pacing();
231 return tabWidth - fmodf(position, tabWidth); 229 return tabWidth - fmodf(position, tabWidth);
232 } 230 }
233 231
234 } // namespace blink 232 } // namespace blink
235 233
236 #endif 234 #endif
OLDNEW
« no previous file with comments | « Source/platform/blink_platform.gypi ('k') | Source/platform/fonts/FontPlatformData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698