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

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

Issue 1197833006: Add Experimental Feature to Force the Complex Text Path (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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
« no previous file with comments | « Source/platform/RuntimeEnabledFeatures.in ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 * Copyright (c) 2007, 2008, 2010 Google Inc. All rights reserved. 6 * Copyright (c) 2007, 2008, 2010 Google Inc. All rights reserved.
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 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 FontCachePurgePreventer purgePreventer; 291 FontCachePurgePreventer purgePreventer;
292 292
293 if (codePath(TextRunPaintInfo(run)) != ComplexPath && !fontDescription().typ esettingFeatures()) 293 if (codePath(TextRunPaintInfo(run)) != ComplexPath && !fontDescription().typ esettingFeatures())
294 return offsetForPositionForSimpleText(run, x, includePartialGlyphs); 294 return offsetForPositionForSimpleText(run, x, includePartialGlyphs);
295 295
296 return offsetForPositionForComplexText(run, x, includePartialGlyphs); 296 return offsetForPositionForComplexText(run, x, includePartialGlyphs);
297 } 297 }
298 298
299 CodePath Font::codePath(const TextRunPaintInfo& runInfo) const 299 CodePath Font::codePath(const TextRunPaintInfo& runInfo) const
300 { 300 {
301 if (RuntimeEnabledFeatures::alwaysUseComplexTextEnabled())
302 return ComplexPath;
303
301 const TextRun& run = runInfo.run; 304 const TextRun& run = runInfo.run;
302 305
303 if (fontDescription().typesettingFeatures() && (runInfo.from || runInfo.to ! = run.length())) 306 if (fontDescription().typesettingFeatures() && (runInfo.from || runInfo.to ! = run.length()))
304 return ComplexPath; 307 return ComplexPath;
305 308
306 if (m_fontDescription.featureSettings() && m_fontDescription.featureSettings ()->size() > 0 && m_fontDescription.letterSpacing() == 0) 309 if (m_fontDescription.featureSettings() && m_fontDescription.featureSettings ()->size() > 0 && m_fontDescription.letterSpacing() == 0)
307 return ComplexPath; 310 return ComplexPath;
308 311
309 if (m_fontDescription.isVerticalBaseline()) 312 if (m_fontDescription.isVerticalBaseline())
310 return ComplexPath; 313 return ComplexPath;
(...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after
837 { 840 {
838 return m_fontFallbackList && m_fontFallbackList->loadingCustomFonts(); 841 return m_fontFallbackList && m_fontFallbackList->loadingCustomFonts();
839 } 842 }
840 843
841 bool Font::isFallbackValid() const 844 bool Font::isFallbackValid() const
842 { 845 {
843 return !m_fontFallbackList || m_fontFallbackList->isValid(); 846 return !m_fontFallbackList || m_fontFallbackList->isValid();
844 } 847 }
845 848
846 } // namespace blink 849 } // namespace blink
OLDNEW
« no previous file with comments | « Source/platform/RuntimeEnabledFeatures.in ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698