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

Side by Side Diff: Source/platform/fonts/Font.cpp

Issue 263363005: Initial patch for FontVariant, variant like HalfWidth should take Complex Path (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@emoji_android
Patch Set: Updating test case Created 6 years, 7 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 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, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2006, 2010, 2011 Apple Inc. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 return s_codePath; 225 return s_codePath;
226 226
227 #if ENABLE(SVG_FONTS) 227 #if ENABLE(SVG_FONTS)
228 if (run.renderingContext()) 228 if (run.renderingContext())
229 return SimplePath; 229 return SimplePath;
230 #endif 230 #endif
231 231
232 if (m_fontDescription.featureSettings() && m_fontDescription.featureSettings ()->size() > 0) 232 if (m_fontDescription.featureSettings() && m_fontDescription.featureSettings ()->size() > 0)
233 return ComplexPath; 233 return ComplexPath;
234 234
235 if (m_fontDescription.widthVariant() != RegularWidth)
236 return ComplexPath;
237
235 if (run.length() > 1 && !WidthIterator::supportsTypesettingFeatures(*this)) 238 if (run.length() > 1 && !WidthIterator::supportsTypesettingFeatures(*this))
236 return ComplexPath; 239 return ComplexPath;
237 240
238 if (!run.characterScanForCodePath()) 241 if (!run.characterScanForCodePath())
239 return SimplePath; 242 return SimplePath;
240 243
241 if (run.is8Bit()) 244 if (run.is8Bit())
242 return SimplePath; 245 return SimplePath;
243 246
244 // Start from 0 since drawing and highlighting also measure the characters b efore run->from. 247 // Start from 0 since drawing and highlighting also measure the characters b efore run->from.
(...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after
830 if (delta <= 0) 833 if (delta <= 0)
831 break; 834 break;
832 } 835 }
833 } 836 }
834 } 837 }
835 838
836 return offset; 839 return offset;
837 } 840 }
838 841
839 } 842 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698