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

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

Issue 130433006: Implement CSS Emphasis Marks for complex text (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed data type choice, made case of zero grapheme clusters explicit, continuing for zero advance Created 6 years, 10 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
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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 class Font; 46 class Font;
47 class SimpleFontData; 47 class SimpleFontData;
48 48
49 class HarfBuzzShaper FINAL { 49 class HarfBuzzShaper FINAL {
50 public: 50 public:
51 enum NormalizeMode { 51 enum NormalizeMode {
52 DoNotNormalizeMirrorChars, 52 DoNotNormalizeMirrorChars,
53 NormalizeMirrorChars 53 NormalizeMirrorChars
54 }; 54 };
55 55
56 HarfBuzzShaper(const Font*, const TextRun&); 56 enum ForTextEmphasisOrNot {
57 NotForTextEmphasis,
58 ForTextEmphasis
59 };
60
61 HarfBuzzShaper(const Font*, const TextRun&, bool forTextEmphasis = false);
leviw_travelin_and_unemployed 2014/02/13 01:07:56 Don't you want to use the enum you defined above,
57 62
58 void setDrawRange(int from, int to); 63 void setDrawRange(int from, int to);
59 bool shape(GlyphBuffer* = 0); 64 bool shape(GlyphBuffer* = 0);
60 FloatPoint adjustStartPoint(const FloatPoint&); 65 FloatPoint adjustStartPoint(const FloatPoint&);
61 float totalWidth() { return m_totalWidth; } 66 float totalWidth() { return m_totalWidth; }
62 int offsetForPosition(float targetX); 67 int offsetForPosition(float targetX);
63 FloatRect selectionRect(const FloatPoint&, int height, int from, int to); 68 FloatRect selectionRect(const FloatPoint&, int height, int from, int to);
64 69
65 private: 70 private:
66 class HarfBuzzRun { 71 class HarfBuzzRun {
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 131
127 // In complex text word-spacing affects each line-break, space (U+0020) and non-breaking space (U+00A0). 132 // In complex text word-spacing affects each line-break, space (U+0020) and non-breaking space (U+00A0).
128 static bool isCodepointSpace(UChar c) { return c == ' ' || c == noBreakSpace || c == '\n'; } 133 static bool isCodepointSpace(UChar c) { return c == ' ' || c == noBreakSpace || c == '\n'; }
129 134
130 void setFontFeatures(); 135 void setFontFeatures();
131 136
132 bool createHarfBuzzRuns(); 137 bool createHarfBuzzRuns();
133 bool shapeHarfBuzzRuns(); 138 bool shapeHarfBuzzRuns();
134 bool fillGlyphBuffer(GlyphBuffer*); 139 bool fillGlyphBuffer(GlyphBuffer*);
135 void fillGlyphBufferFromHarfBuzzRun(GlyphBuffer*, HarfBuzzRun*, FloatPoint& firstOffsetOfNextRun); 140 void fillGlyphBufferFromHarfBuzzRun(GlyphBuffer*, HarfBuzzRun*, FloatPoint& firstOffsetOfNextRun);
141 void fillGlyphBufferForTextEmphasis(GlyphBuffer*, HarfBuzzRun* currentRun);
136 void setGlyphPositionsForHarfBuzzRun(HarfBuzzRun*, hb_buffer_t*); 142 void setGlyphPositionsForHarfBuzzRun(HarfBuzzRun*, hb_buffer_t*);
137 void addHarfBuzzRun(unsigned startCharacter, unsigned endCharacter, const Si mpleFontData*, UScriptCode); 143 void addHarfBuzzRun(unsigned startCharacter, unsigned endCharacter, const Si mpleFontData*, UScriptCode);
138 144
139 GlyphBufferAdvance createGlyphBufferAdvance(float, float); 145 GlyphBufferAdvance createGlyphBufferAdvance(float, float);
140 146
141 const Font* m_font; 147 const Font* m_font;
142 OwnPtr<UChar[]> m_normalizedBuffer; 148 OwnPtr<UChar[]> m_normalizedBuffer;
143 unsigned m_normalizedBufferLength; 149 unsigned m_normalizedBufferLength;
144 const TextRun& m_run; 150 const TextRun& m_run;
145 151
146 float m_wordSpacingAdjustment; // Delta adjustment (pixels) for each word br eak. 152 float m_wordSpacingAdjustment; // Delta adjustment (pixels) for each word br eak.
147 float m_padding; // Pixels to be distributed over the line at word breaks. 153 float m_padding; // Pixels to be distributed over the line at word breaks.
148 float m_padPerWordBreak; // Pixels to be added to each word break. 154 float m_padPerWordBreak; // Pixels to be added to each word break.
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. 155 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.
150 float m_letterSpacing; // Pixels to be added after each glyph. 156 float m_letterSpacing; // Pixels to be added after each glyph.
151 157
152 Vector<hb_feature_t, 4> m_features; 158 Vector<hb_feature_t, 4> m_features;
153 Vector<OwnPtr<HarfBuzzRun>, 16> m_harfBuzzRuns; 159 Vector<OwnPtr<HarfBuzzRun>, 16> m_harfBuzzRuns;
154 160
155 FloatPoint m_startOffset; 161 FloatPoint m_startOffset;
156 162
157 int m_fromIndex; 163 int m_fromIndex;
158 int m_toIndex; 164 int m_toIndex;
159 165
166 bool m_forTextEmphasis;
167
160 float m_totalWidth; 168 float m_totalWidth;
161 169
162 friend struct CachedShapingResults; 170 friend struct CachedShapingResults;
163 }; 171 };
164 172
165 } // namespace WebCore 173 } // namespace WebCore
166 174
167 #endif // HarfBuzzShaper_h 175 #endif // HarfBuzzShaper_h
OLDNEW
« no previous file with comments | « Source/platform/fonts/harfbuzz/FontHarfBuzz.cpp ('k') | Source/platform/fonts/harfbuzz/HarfBuzzShaper.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698