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

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

Issue 325673002: Fixing handling of Ligature when letter-spacing is present (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Code Issue fix Created 6 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
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 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 CodePath Font::codePath(const TextRun& run) const 243 CodePath Font::codePath(const TextRun& run) const
244 { 244 {
245 if (s_codePath != AutoPath) 245 if (s_codePath != AutoPath)
246 return s_codePath; 246 return s_codePath;
247 247
248 #if ENABLE(SVG_FONTS) 248 #if ENABLE(SVG_FONTS)
249 if (run.renderingContext()) 249 if (run.renderingContext())
250 return SimplePath; 250 return SimplePath;
251 #endif 251 #endif
252 252
253 if (m_fontDescription.featureSettings() && m_fontDescription.featureSettings ()->size() > 0) 253 if (m_fontDescription.featureSettings() && m_fontDescription.featureSettings ()->size() > 0 && m_fontDescription.letterSpacing() == 0)
254 return ComplexPath; 254 return ComplexPath;
255 255
256 if (run.length() > 1 && !WidthIterator::supportsTypesettingFeatures(*this)) 256 if (run.length() > 1 && !WidthIterator::supportsTypesettingFeatures(*this))
257 return ComplexPath; 257 return ComplexPath;
258 258
259 if (!run.characterScanForCodePath()) 259 if (!run.characterScanForCodePath())
260 return SimplePath; 260 return SimplePath;
261 261
262 if (run.is8Bit()) 262 if (run.is8Bit())
263 return SimplePath; 263 return SimplePath;
(...skipping 587 matching lines...) Expand 10 before | Expand all | Expand 10 after
851 if (delta <= 0) 851 if (delta <= 0)
852 break; 852 break;
853 } 853 }
854 } 854 }
855 } 855 }
856 856
857 return offset; 857 return offset;
858 } 858 }
859 859
860 } 860 }
OLDNEW
« no previous file with comments | « LayoutTests/fast/text/font-ligature-letter-spacing-expected.txt ('k') | Source/platform/fonts/FontDescription.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698