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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/platform/fonts/Font.cpp

Issue 111833006: Avoiding multiple text/string parsing while creating TextRun (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@FontOptPatch1
Patch Set: Fixing review comments for rebasing files Created 7 years 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 side-by-side diff with in-line comments
Download patch
« Source/core/rendering/svg/SVGTextMetricsBuilder.cpp ('K') | « Source/platform/fonts/Font.h ('k') | Source/platform/fonts/FontTest.cpp » ('j') | Source/platform/graphics/TextRun.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/fonts/Font.cpp
diff --git a/Source/platform/fonts/Font.cpp b/Source/platform/fonts/Font.cpp
index e0dfa3d0383b715841d8e20d959f4130fd9146a3..679961d758a9fd2972628cb26f263cf5091046ea 100644
--- a/Source/platform/fonts/Font.cpp
+++ b/Source/platform/fonts/Font.cpp
@@ -78,7 +78,7 @@ static const UChar32 cjkIsolatedSymbolsArray[] = {
0x1F100
};
-Font::CodePath Font::s_codePath = Auto;
+CodePath Font::s_codePath = AutoPath;
TypesettingFeatures Font::s_defaultTypesettingFeatures = 0;
@@ -175,12 +175,16 @@ void Font::drawText(GraphicsContext* context, const TextRunPaintInfo& runInfo, c
if (loadingCustomFonts() && customFontNotReadyAction == DoNotPaintIfFontNotReady)
return;
- CodePath codePathToUse = codePath(runInfo.run);
+ CodePath codePathToUse = runInfo.run.characterScanForCodePathValue();
+
+ if (codePathToUse == AutoPath)
+ codePathToUse = codePath(runInfo.run);
+
// FIXME: Use the fast code path once it handles partial runs with kerning and ligatures. See http://webkit.org/b/100050
- if (codePathToUse != Complex && typesettingFeatures() && (runInfo.from || runInfo.to != runInfo.run.length()))
- codePathToUse = Complex;
+ if (codePathToUse != ComplexPath&& typesettingFeatures() && (runInfo.from || runInfo.to != runInfo.run.length()))
eseidel 2013/12/27 04:36:45 nit: missing space before &&
+ codePathToUse = ComplexPath;
- if (codePathToUse != Complex)
+ if (codePathToUse != ComplexPath)
return drawSimpleText(context, runInfo, point);
return drawComplexText(context, runInfo, point);
@@ -191,12 +195,15 @@ void Font::drawEmphasisMarks(GraphicsContext* context, const TextRunPaintInfo& r
if (loadingCustomFonts())
return;
- CodePath codePathToUse = codePath(runInfo.run);
+ CodePath codePathToUse = runInfo.run.characterScanForCodePathValue();
+ if (codePathToUse == AutoPath)
+ codePathToUse = codePath(runInfo.run);
+
// FIXME: Use the fast code path once it handles partial runs with kerning and ligatures. See http://webkit.org/b/100050
- if (codePathToUse != Complex && typesettingFeatures() && (runInfo.from || runInfo.to != runInfo.run.length()))
- codePathToUse = Complex;
+ if (codePathToUse != ComplexPath && typesettingFeatures() && (runInfo.from || runInfo.to != runInfo.run.length()))
+ codePathToUse = ComplexPath;
- if (codePathToUse != Complex)
+ if (codePathToUse != ComplexPath)
drawEmphasisMarksForSimpleText(context, runInfo, mark, point);
else
drawEmphasisMarksForComplexText(context, runInfo, mark, point);
@@ -204,13 +211,17 @@ void Font::drawEmphasisMarks(GraphicsContext* context, const TextRunPaintInfo& r
float Font::width(const TextRun& run, HashSet<const SimpleFontData*>* fallbackFonts, GlyphOverflow* glyphOverflow) const
{
- CodePath codePathToUse = codePath(run);
- if (codePathToUse != Complex) {
+ CodePath codePathToUse = run.characterScanForCodePathValue();
+
+ if (codePathToUse == AutoPath)
+ codePathToUse = codePath(run);
+
+ if (codePathToUse != ComplexPath) {
// The complex path is more restrictive about returning fallback fonts than the simple path, so we need an explicit test to make their behaviors match.
if (!canReturnFallbackFontsForComplexText())
fallbackFonts = 0;
// The simple path can optimize the case where glyph overflow is not observable.
- if (codePathToUse != SimpleWithGlyphOverflow && (glyphOverflow && !glyphOverflow->computeBounds))
+ if (codePathToUse != SimpleWithGlyphOverflowPath && (glyphOverflow && !glyphOverflow->computeBounds))
glyphOverflow = 0;
}
@@ -221,7 +232,7 @@ float Font::width(const TextRun& run, HashSet<const SimpleFontData*>* fallbackFo
return *cacheEntry;
float result;
- if (codePathToUse == Complex)
+ if (codePathToUse == ComplexPath)
result = floatWidthForComplexText(run, fallbackFonts, glyphOverflow);
else
result = floatWidthForSimpleText(run, fallbackFonts, glyphOverflow);
@@ -267,12 +278,16 @@ FloatRect Font::selectionRectForText(const TextRun& run, const FloatPoint& point
{
to = (to == -1 ? run.length() : to);
- CodePath codePathToUse = codePath(run);
+ CodePath codePathToUse = run.characterScanForCodePathValue();
+
+ if (codePathToUse == AutoPath)
+ codePathToUse = codePath(run);
+
// FIXME: Use the fast code path once it handles partial runs with kerning and ligatures. See http://webkit.org/b/100050
- if (codePathToUse != Complex && typesettingFeatures() && (from || to != run.length()))
- codePathToUse = Complex;
+ if (codePathToUse != ComplexPath && typesettingFeatures() && (from || to != run.length()))
+ codePathToUse = ComplexPath;
- if (codePathToUse != Complex)
+ if (codePathToUse != ComplexPath)
return selectionRectForSimpleText(run, point, h, from, to);
return selectionRectForComplexText(run, point, h, from, to);
@@ -281,7 +296,12 @@ FloatRect Font::selectionRectForText(const TextRun& run, const FloatPoint& point
int Font::offsetForPosition(const TextRun& run, float x, bool includePartialGlyphs) const
{
// FIXME: Use the fast code path once it handles partial runs with kerning and ligatures. See http://webkit.org/b/100050
- if (codePath(run) != Complex && !typesettingFeatures())
+ CodePath codePathToUse = run.characterScanForCodePathValue();
+
+ if (codePathToUse == AutoPath)
+ codePathToUse = codePath(run);
+
+ if (codePathToUse != ComplexPath && !typesettingFeatures())
return offsetForPositionForSimpleText(run, x, includePartialGlyphs);
return offsetForPositionForComplexText(run, x, includePartialGlyphs);
@@ -327,7 +347,7 @@ void Font::setCodePath(CodePath p)
s_codePath = p;
}
-Font::CodePath Font::codePath()
+CodePath Font::codePath()
{
return s_codePath;
}
@@ -342,27 +362,27 @@ TypesettingFeatures Font::defaultTypesettingFeatures()
return s_defaultTypesettingFeatures;
}
-Font::CodePath Font::codePath(const TextRun& run) const
+CodePath Font::codePath(const TextRun& run) const
{
- if (s_codePath != Auto)
+ if (s_codePath != AutoPath)
return s_codePath;
#if ENABLE(SVG_FONTS)
if (run.renderingContext())
- return Simple;
+ return SimplePath;
#endif
if (m_fontDescription.featureSettings() && m_fontDescription.featureSettings()->size() > 0)
- return Complex;
+ return ComplexPath;
if (run.length() > 1 && !WidthIterator::supportsTypesettingFeatures(*this))
- return Complex;
+ return ComplexPath;
if (!run.characterScanForCodePath())
- return Simple;
+ return SimplePath;
if (run.is8Bit())
- return Simple;
+ return SimplePath;
// Start from 0 since drawing and highlighting also measure the characters before run->from.
return characterRangeCodePath(run.characters16(), run.length());
@@ -378,7 +398,7 @@ static inline UChar32 keyExtractorUChar32(const UChar32* value)
return *value;
}
-Font::CodePath Font::characterRangeCodePath(const UChar* characters, unsigned len)
+CodePath Font::characterRangeCodePath(const UChar* characters, unsigned len)
{
static const UChar complexCodePathRanges[] = {
// U+02E5 through U+02E9 (Modifier Letters : Tone letters)
@@ -430,7 +450,7 @@ Font::CodePath Font::characterRangeCodePath(const UChar* characters, unsigned le
};
static size_t complexCodePathRangesCount = WTF_ARRAY_LENGTH(complexCodePathRanges);
- CodePath result = Simple;
+ CodePath result = SimplePath;
for (unsigned i = 0; i < len; i++) {
const UChar c = characters[i];
@@ -440,7 +460,7 @@ Font::CodePath Font::characterRangeCodePath(const UChar* characters, unsigned le
// U+1E00 through U+2000 characters with diacritics and stacked diacritics
if (c >= 0x1E00 && c <= 0x2000) {
- result = SimpleWithGlyphOverflow;
+ result = SimpleWithGlyphOverflowPath;
continue;
}
@@ -458,12 +478,12 @@ Font::CodePath Font::characterRangeCodePath(const UChar* characters, unsigned le
if (supplementaryCharacter < 0x1F1E6) // U+1F1E6 through U+1F1FF Regional Indicator Symbols
continue;
if (supplementaryCharacter <= 0x1F1FF)
- return Complex;
+ return ComplexPath;
if (supplementaryCharacter < 0xE0100) // U+E0100 through U+E01EF Unicode variation selectors.
continue;
if (supplementaryCharacter <= 0xE01EF)
- return Complex;
+ return ComplexPath;
// FIXME: Check for Brahmi (U+11000 block), Kaithi (U+11080 block) and other complex scripts
// in plane 1 or higher.
@@ -476,18 +496,18 @@ Font::CodePath Font::characterRangeCodePath(const UChar* characters, unsigned le
(UChar*)complexCodePathRanges, complexCodePathRangesCount, c, keyExtractorUChar);
// Exact matches are complex
if (*boundingCharacter == c)
- return Complex;
+ return ComplexPath;
bool isEndOfRange = ((boundingCharacter - complexCodePathRanges) % 2);
if (*boundingCharacter < c) {
// Determine if we are in a range or out
if (!isEndOfRange)
- return Complex;
+ return ComplexPath;
continue;
}
ASSERT(*boundingCharacter > c);
// Determine if we are in a range or out - opposite condition to above
if (isEndOfRange)
- return Complex;
+ return ComplexPath;
}
return result;
« Source/core/rendering/svg/SVGTextMetricsBuilder.cpp ('K') | « Source/platform/fonts/Font.h ('k') | Source/platform/fonts/FontTest.cpp » ('j') | Source/platform/graphics/TextRun.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698