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

Side by Side Diff: Source/platform/fonts/harfbuzz/HarfBuzzShaper.h

Issue 327243005: Remove GlyphBufferAdvance abstraction. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase again Created 6 years, 6 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 void setFontFeatures(); 131 void setFontFeatures();
132 132
133 bool createHarfBuzzRuns(); 133 bool createHarfBuzzRuns();
134 bool shapeHarfBuzzRuns(); 134 bool shapeHarfBuzzRuns();
135 bool fillGlyphBuffer(GlyphBuffer*); 135 bool fillGlyphBuffer(GlyphBuffer*);
136 void fillGlyphBufferFromHarfBuzzRun(GlyphBuffer*, HarfBuzzRun*, FloatPoint& firstOffsetOfNextRun); 136 void fillGlyphBufferFromHarfBuzzRun(GlyphBuffer*, HarfBuzzRun*, FloatPoint& firstOffsetOfNextRun);
137 void fillGlyphBufferForTextEmphasis(GlyphBuffer*, HarfBuzzRun* currentRun); 137 void fillGlyphBufferForTextEmphasis(GlyphBuffer*, HarfBuzzRun* currentRun);
138 void setGlyphPositionsForHarfBuzzRun(HarfBuzzRun*, hb_buffer_t*); 138 void setGlyphPositionsForHarfBuzzRun(HarfBuzzRun*, hb_buffer_t*);
139 void addHarfBuzzRun(unsigned startCharacter, unsigned endCharacter, const Si mpleFontData*, UScriptCode); 139 void addHarfBuzzRun(unsigned startCharacter, unsigned endCharacter, const Si mpleFontData*, UScriptCode);
140 140
141 GlyphBufferAdvance createGlyphBufferAdvance(float, float);
142
143 const Font* m_font; 141 const Font* m_font;
144 OwnPtr<UChar[]> m_normalizedBuffer; 142 OwnPtr<UChar[]> m_normalizedBuffer;
145 unsigned m_normalizedBufferLength; 143 unsigned m_normalizedBufferLength;
146 const TextRun& m_run; 144 const TextRun& m_run;
147 145
148 float m_wordSpacingAdjustment; // Delta adjustment (pixels) for each word br eak. 146 float m_wordSpacingAdjustment; // Delta adjustment (pixels) for each word br eak.
149 float m_padding; // Pixels to be distributed over the line at word breaks. 147 float m_padding; // Pixels to be distributed over the line at word breaks.
150 float m_padPerWordBreak; // Pixels to be added to each word break. 148 float m_padPerWordBreak; // Pixels to be added to each word break.
151 float m_padError; // m_padPerWordBreak might have a fractional component. Si nce we only add a whole number of padding pixels at each word break we accumulat e error. This is the number of pixels that we are behind so far. 149 float m_padError; // m_padPerWordBreak might have a fractional component. Si nce we only add a whole number of padding pixels at each word break we accumulat e error. This is the number of pixels that we are behind so far.
152 float m_letterSpacing; // Pixels to be added after each glyph. 150 float m_letterSpacing; // Pixels to be added after each glyph.
(...skipping 10 matching lines...) Expand all
163 161
164 float m_totalWidth; 162 float m_totalWidth;
165 FloatBoxExtent m_glyphBoundingBox; 163 FloatBoxExtent m_glyphBoundingBox;
166 164
167 friend struct CachedShapingResults; 165 friend struct CachedShapingResults;
168 }; 166 };
169 167
170 } // namespace WebCore 168 } // namespace WebCore
171 169
172 #endif // HarfBuzzShaper_h 170 #endif // HarfBuzzShaper_h
OLDNEW
« no previous file with comments | « Source/platform/fonts/harfbuzz/HarfBuzzFaceSkia.cpp ('k') | Source/platform/fonts/harfbuzz/HarfBuzzShaper.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698