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

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

Issue 617103003: Replace ENABLE_OPENTYPE_VERTICAL implementation with HarfBuzz (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@removeOpenTypeVertical
Patch Set: Created 6 years, 2 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 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 return s_codePath; 278 return s_codePath;
279 279
280 #if ENABLE(SVG_FONTS) 280 #if ENABLE(SVG_FONTS)
281 if (run.renderingContext()) 281 if (run.renderingContext())
282 return SimplePath; 282 return SimplePath;
283 #endif 283 #endif
284 284
285 if (m_fontDescription.featureSettings() && m_fontDescription.featureSettings ()->size() > 0 && m_fontDescription.letterSpacing() == 0) 285 if (m_fontDescription.featureSettings() && m_fontDescription.featureSettings ()->size() > 0 && m_fontDescription.letterSpacing() == 0)
286 return ComplexPath; 286 return ComplexPath;
287 287
288 if (m_fontDescription.orientation() == Vertical)
289 return ComplexPath;
290
288 if (m_fontDescription.widthVariant() != RegularWidth) 291 if (m_fontDescription.widthVariant() != RegularWidth)
289 return ComplexPath; 292 return ComplexPath;
290 293
291 if (run.length() > 1 && fontDescription().typesettingFeatures()) 294 if (run.length() > 1 && fontDescription().typesettingFeatures())
292 return ComplexPath; 295 return ComplexPath;
293 296
294 // FIXME: This really shouldn't be needed but for some reason the 297 // FIXME: This really shouldn't be needed but for some reason the
295 // TextRendering setting doesn't propagate to typesettingFeatures in time 298 // TextRendering setting doesn't propagate to typesettingFeatures in time
296 // for the prefs width calculation. 299 // for the prefs width calculation.
297 if (fontDescription().textRendering() == OptimizeLegibility || fontDescripti on().textRendering() == GeometricPrecision) 300 if (fontDescription().textRendering() == OptimizeLegibility || fontDescripti on().textRendering() == GeometricPrecision)
(...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after
899 if (delta <= 0) 902 if (delta <= 0)
900 break; 903 break;
901 } 904 }
902 } 905 }
903 } 906 }
904 907
905 return offset; 908 return offset;
906 } 909 }
907 910
908 } // namespace blink 911 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698