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

Side by Side Diff: trunk/Source/platform/fonts/Font.h

Issue 146503002: Revert 165189 "Rendering text-justify:distribute for 8 bit chara..." (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 6 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 | Annotate | Revision Log
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, 2006, 2007, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2006, 2007, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) 2008 Holger Hans Peter Freyther 6 * Copyright (C) 2008 Holger Hans Peter Freyther
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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 } 143 }
144 #if OS(MACOSX) 144 #if OS(MACOSX)
145 const SimpleFontData* fontDataForCombiningCharacterSequence(const UChar*, si ze_t length, FontDataVariant) const; 145 const SimpleFontData* fontDataForCombiningCharacterSequence(const UChar*, si ze_t length, FontDataVariant) const;
146 #endif 146 #endif
147 std::pair<GlyphData, GlyphPage*> glyphDataAndPageForCharacter(UChar32, bool mirror, FontDataVariant = AutoVariant) const; 147 std::pair<GlyphData, GlyphPage*> glyphDataAndPageForCharacter(UChar32, bool mirror, FontDataVariant = AutoVariant) const;
148 bool primaryFontHasGlyphForCharacter(UChar32) const; 148 bool primaryFontHasGlyphForCharacter(UChar32) const;
149 149
150 static bool isCJKIdeograph(UChar32); 150 static bool isCJKIdeograph(UChar32);
151 static bool isCJKIdeographOrSymbol(UChar32); 151 static bool isCJKIdeographOrSymbol(UChar32);
152 152
153 static unsigned expansionOpportunityCount(const LChar*, size_t length, TextD irection, bool& isAfterExpansion, bool distributeJustification); 153 static unsigned expansionOpportunityCount(const LChar*, size_t length, TextD irection, bool& isAfterExpansion);
154 static unsigned expansionOpportunityCount(const UChar*, size_t length, TextD irection, bool& isAfterExpansion, bool distributeJustification); 154 static unsigned expansionOpportunityCount(const UChar*, size_t length, TextD irection, bool& isAfterExpansion);
155 155
156 static void setShouldUseSmoothing(bool); 156 static void setShouldUseSmoothing(bool);
157 static bool shouldUseSmoothing(); 157 static bool shouldUseSmoothing();
158 158
159 CodePath codePath(const TextRun&) const; 159 CodePath codePath(const TextRun&) const;
160 static CodePath characterRangeCodePath(const LChar*, unsigned) { return Simp lePath; } 160 static CodePath characterRangeCodePath(const LChar*, unsigned) { return Simp lePath; }
161 static CodePath characterRangeCodePath(const UChar*, unsigned len); 161 static CodePath characterRangeCodePath(const UChar*, unsigned len);
162 162
163 private: 163 private:
164 enum ForTextEmphasisOrNot { NotForTextEmphasis, ForTextEmphasis }; 164 enum ForTextEmphasisOrNot { NotForTextEmphasis, ForTextEmphasis };
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 { 318 {
319 if (!tabSize) 319 if (!tabSize)
320 return letterSpacing(); 320 return letterSpacing();
321 float tabWidth = tabSize * fontData.spaceWidth() + letterSpacing(); 321 float tabWidth = tabSize * fontData.spaceWidth() + letterSpacing();
322 return tabWidth - fmodf(position, tabWidth); 322 return tabWidth - fmodf(position, tabWidth);
323 } 323 }
324 324
325 } 325 }
326 326
327 #endif 327 #endif
OLDNEW
« no previous file with comments | « trunk/Source/core/rendering/RenderBlockLineLayout.cpp ('k') | trunk/Source/platform/fonts/Font.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698