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

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: New Approach, splitting hb-clusters into grapheme clusters, comment cleanup, rebaseline 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);
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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 float m_letterSpacing; // Pixels to be added after each glyph. 155 float m_letterSpacing; // Pixels to be added after each glyph.
151 156
152 Vector<hb_feature_t, 4> m_features; 157 Vector<hb_feature_t, 4> m_features;
153 Vector<OwnPtr<HarfBuzzRun>, 16> m_harfBuzzRuns; 158 Vector<OwnPtr<HarfBuzzRun>, 16> m_harfBuzzRuns;
154 159
155 FloatPoint m_startOffset; 160 FloatPoint m_startOffset;
156 161
157 int m_fromIndex; 162 int m_fromIndex;
158 int m_toIndex; 163 int m_toIndex;
159 164
165 bool m_forTextEmphasis;
166
160 float m_totalWidth; 167 float m_totalWidth;
161 168
162 friend struct CachedShapingResults; 169 friend struct CachedShapingResults;
163 }; 170 };
164 171
165 } // namespace WebCore 172 } // namespace WebCore
166 173
167 #endif // HarfBuzzShaper_h 174 #endif // HarfBuzzShaper_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698