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

Side by Side Diff: Source/core/platform/graphics/skia/FontCacheSkia.cpp

Issue 23503080: Pass DOM locale to Skia in FontCache::getFontDataForCharacter (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@fontcleanup
Patch Set: Pure Android only Created 7 years, 3 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) 2006, 2007, 2008, 2009 Google Inc. All rights reserved. 2 * Copyright (c) 2006, 2007, 2008, 2009 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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 CString name; 163 CString name;
164 SkTypeface* tf = createTypeface(fontDescription, family, name); 164 SkTypeface* tf = createTypeface(fontDescription, family, name);
165 if (!tf) 165 if (!tf)
166 return 0; 166 return 0;
167 167
168 FontPlatformData* result = new FontPlatformData(tf, 168 FontPlatformData* result = new FontPlatformData(tf,
169 name.data(), 169 name.data(),
170 fontDescription.computedSize(), 170 fontDescription.computedSize(),
171 fontDescription.weight() >= FontWeightBold && !tf->isBold(), 171 fontDescription.weight() >= FontWeightBold && !tf->isBold(),
172 fontDescription.italic() && !tf->isItalic(), 172 fontDescription.italic() && !tf->isItalic(),
173 fontDescription.orientation()); 173 fontDescription.orientation(),
174 #if OS(ANDROID)
175 // On Android FontPlatformData from different locales need to be disting uished
176 // to avoid conflict of glyphs from different locale-perferred fallback fonts.
falken 2013/09/25 08:11:51 Same as previous comment.
177 fontDescription.locale());
178 #else
179 AtomicString());
180 #endif
174 tf->unref(); 181 tf->unref();
175 return result; 182 return result;
176 } 183 }
177 #endif // !OS(WINDOWNS) 184 #endif // !OS(WINDOWNS)
178 185
179 } // namespace WebCore 186 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698