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

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

Issue 847813002: Update typesetting features when letter-spacing is changed. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 11 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 | « LayoutTests/fast/text/font-ligature-letter-spacing-expected.txt ('k') | no next file » | 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, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed.
6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
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 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 void setOrientation(FontOrientation orientation) { m_orientation = orientati on; } 194 void setOrientation(FontOrientation orientation) { m_orientation = orientati on; }
195 void setNonCJKGlyphOrientation(NonCJKGlyphOrientation orientation) { m_nonCJ KGlyphOrientation = orientation; } 195 void setNonCJKGlyphOrientation(NonCJKGlyphOrientation orientation) { m_nonCJ KGlyphOrientation = orientation; }
196 void setWidthVariant(FontWidthVariant widthVariant) { m_widthVariant = width Variant; } 196 void setWidthVariant(FontWidthVariant widthVariant) { m_widthVariant = width Variant; }
197 void setScript(UScriptCode s) { m_script = s; } 197 void setScript(UScriptCode s) { m_script = s; }
198 void setLocale(const String& locale) { m_locale = locale; } 198 void setLocale(const String& locale) { m_locale = locale; }
199 void setSyntheticBold(bool syntheticBold) { m_syntheticBold = syntheticBold; } 199 void setSyntheticBold(bool syntheticBold) { m_syntheticBold = syntheticBold; }
200 void setSyntheticItalic(bool syntheticItalic) { m_syntheticItalic = syntheti cItalic; } 200 void setSyntheticItalic(bool syntheticItalic) { m_syntheticItalic = syntheti cItalic; }
201 void setFeatureSettings(PassRefPtr<FontFeatureSettings> settings) { m_featur eSettings = settings; } 201 void setFeatureSettings(PassRefPtr<FontFeatureSettings> settings) { m_featur eSettings = settings; }
202 void setTraits(FontTraits); 202 void setTraits(FontTraits);
203 void setWordSpacing(float s) { m_wordSpacing = s; } 203 void setWordSpacing(float s) { m_wordSpacing = s; }
204 void setLetterSpacing(float s) { m_letterSpacing = s; } 204 void setLetterSpacing(float s) { m_letterSpacing = s; updateTypesettingFeatu res(); }
205 205
206 TypesettingFeatures typesettingFeatures() const { return static_cast<Typeset tingFeatures>(m_typesettingFeatures); } 206 TypesettingFeatures typesettingFeatures() const { return static_cast<Typeset tingFeatures>(m_typesettingFeatures); }
207 207
208 static void setSubpixelPositioning(bool b) { s_useSubpixelTextPositioning = b; } 208 static void setSubpixelPositioning(bool b) { s_useSubpixelTextPositioning = b; }
209 static bool subpixelPositioning() { return s_useSubpixelTextPositioning; } 209 static bool subpixelPositioning() { return s_useSubpixelTextPositioning; }
210 210
211 static void setDefaultTypesettingFeatures(TypesettingFeatures); 211 static void setDefaultTypesettingFeatures(TypesettingFeatures);
212 static TypesettingFeatures defaultTypesettingFeatures(); 212 static TypesettingFeatures defaultTypesettingFeatures();
213 213
214 private: 214 private:
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 && m_script == other.m_script 290 && m_script == other.m_script
291 && m_syntheticBold == other.m_syntheticBold 291 && m_syntheticBold == other.m_syntheticBold
292 && m_syntheticItalic == other.m_syntheticItalic 292 && m_syntheticItalic == other.m_syntheticItalic
293 && m_featureSettings == other.m_featureSettings 293 && m_featureSettings == other.m_featureSettings
294 && m_subpixelTextPosition == other.m_subpixelTextPosition; 294 && m_subpixelTextPosition == other.m_subpixelTextPosition;
295 } 295 }
296 296
297 } // namespace blink 297 } // namespace blink
298 298
299 #endif 299 #endif
OLDNEW
« no previous file with comments | « LayoutTests/fast/text/font-ligature-letter-spacing-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698