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

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

Issue 1206883002: Fix default text orientation that do not conform Unicode Technical Report #50 (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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
« no previous file with comments | « Source/platform/fonts/Font.cpp ('k') | Source/platform/fonts/FontOrientation.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, 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 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 bool isSyntheticBold() const { return m_syntheticBold; } 166 bool isSyntheticBold() const { return m_syntheticBold; }
167 bool isSyntheticItalic() const { return m_syntheticItalic; } 167 bool isSyntheticItalic() const { return m_syntheticItalic; }
168 bool useSubpixelPositioning() const { return m_subpixelTextPosition; } 168 bool useSubpixelPositioning() const { return m_subpixelTextPosition; }
169 169
170 FontTraits traits() const; 170 FontTraits traits() const;
171 float wordSpacing() const { return m_wordSpacing; } 171 float wordSpacing() const { return m_wordSpacing; }
172 float letterSpacing() const { return m_letterSpacing; } 172 float letterSpacing() const { return m_letterSpacing; }
173 FontOrientation orientation() const { return static_cast<FontOrientation>(m_ orientation); } 173 FontOrientation orientation() const { return static_cast<FontOrientation>(m_ orientation); }
174 bool isVerticalAnyUpright() const { return blink::isVerticalAnyUpright(orien tation()); } 174 bool isVerticalAnyUpright() const { return blink::isVerticalAnyUpright(orien tation()); }
175 bool isVerticalNonCJKUpright() const { return blink::isVerticalNonCJKUpright (orientation()); } 175 bool isVerticalNonCJKUpright() const { return blink::isVerticalNonCJKUpright (orientation()); }
176 bool isVerticalUpright(UChar32 character) const { return blink::isVerticalUp right(orientation(), character); }
176 bool isVerticalBaseline() const { return blink::isVerticalBaseline(orientati on()); } 177 bool isVerticalBaseline() const { return blink::isVerticalBaseline(orientati on()); }
177 FontWidthVariant widthVariant() const { return static_cast<FontWidthVariant> (m_widthVariant); } 178 FontWidthVariant widthVariant() const { return static_cast<FontWidthVariant> (m_widthVariant); }
178 FontFeatureSettings* featureSettings() const { return m_featureSettings.get( ); } 179 FontFeatureSettings* featureSettings() const { return m_featureSettings.get( ); }
179 180
180 float effectiveFontSize() const; // Returns either the computedSize or the c omputedPixelSize 181 float effectiveFontSize() const; // Returns either the computedSize or the c omputedPixelSize
181 FontCacheKey cacheKey(const FontFaceCreationParams&, FontTraits desiredTrait s = FontTraits(0)) const; 182 FontCacheKey cacheKey(const FontFaceCreationParams&, FontTraits desiredTrait s = FontTraits(0)) const;
182 183
183 void setFamily(const FontFamily& family) { m_familyList = family; } 184 void setFamily(const FontFamily& family) { m_familyList = family; }
184 void setComputedSize(float s) { m_computedSize = clampTo<float>(s); } 185 void setComputedSize(float s) { m_computedSize = clampTo<float>(s); }
185 void setSpecifiedSize(float s) { m_specifiedSize = clampTo<float>(s); } 186 void setSpecifiedSize(float s) { m_specifiedSize = clampTo<float>(s); }
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 && m_script == other.m_script 303 && m_script == other.m_script
303 && m_syntheticBold == other.m_syntheticBold 304 && m_syntheticBold == other.m_syntheticBold
304 && m_syntheticItalic == other.m_syntheticItalic 305 && m_syntheticItalic == other.m_syntheticItalic
305 && m_featureSettings == other.m_featureSettings 306 && m_featureSettings == other.m_featureSettings
306 && m_subpixelTextPosition == other.m_subpixelTextPosition; 307 && m_subpixelTextPosition == other.m_subpixelTextPosition;
307 } 308 }
308 309
309 } // namespace blink 310 } // namespace blink
310 311
311 #endif 312 #endif
OLDNEW
« no previous file with comments | « Source/platform/fonts/Font.cpp ('k') | Source/platform/fonts/FontOrientation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698