Changeset 132178 in webkit

Timestamp:

Oct 22, 2012, 10:11:29 PM (14 years ago)

Author:

mitz@apple.com

Message:

Font’s fast code path is used for partial runs with kerning and ligatures, but shouldn’t be
​https://bugs.webkit.org/show_bug.cgi?id=100068

Reviewed by Sam Weinig.

As described in <​http://webkit.org/b/100050>, the fast code path doesn’t handle partial runs
correctly when kerning or ligatures are enabled. Since the partial-run case is uncommon,
for now just use the complex code path in this case.

• platform/graphics/Font.cpp:

(WebCore::Font::drawText): Changed to use the complex path for partial runs if there are any
typesetting features.
(WebCore::Font::drawEmphasisMarks): Ditto.
(WebCore::Font::selectionRectForText): Ditto.
(WebCore::Font::offsetForPosition): Changed to use the complex path if there are any
typesetting features.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/Font.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-22  Dan Bernstein  <mitz@apple.com>
+
+        Font’s fast code path is used for partial runs with kerning and ligatures, but shouldn’t be
+        https://bugs.webkit.org/show_bug.cgi?id=100068
+
+        Reviewed by Sam Weinig.
+
+        As described in <http://webkit.org/b/100050>, the fast code path doesn’t handle partial runs
+        correctly when kerning or ligatures are enabled. Since the partial-run case is uncommon,
+        for now just use the complex code path in this case.
+
+        * platform/graphics/Font.cpp:
+        (WebCore::Font::drawText): Changed to use the complex path for partial runs if there are any
+        typesetting features.
+        (WebCore::Font::drawEmphasisMarks): Ditto.
+        (WebCore::Font::selectionRectForText): Ditto.
+        (WebCore::Font::offsetForPosition): Changed to use the complex path if there are any
+        typesetting features.
+
 2012-10-22  Peter Wang  <peter.wang@torchmobile.com.cn>
 

trunk/Source/WebCore/platform/graphics/Font.cpp

@@ -160 +160 @@
 
     CodePath 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 != Complex)
@@ -175 +178 @@
         to = run.length();
 
-    if (codePath(run) != Complex)
+    CodePath 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 != Complex)
         drawEmphasisMarksForSimpleText(context, run, mark, point, from, to);
     else
@@ -233 +241 @@
     to = (to == -1 ? run.length() : to);
 
-    if (codePath(run) != Complex)
+    CodePath 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 != Complex)
         return selectionRectForSimpleText(run, point, h, from, to);
 
@@ -241 +254 @@
 int Font::offsetForPosition(const TextRun& run, float x, bool includePartialGlyphs) const
 {
-    if (codePath(run) != Complex)
+    // 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())
         return offsetForPositionForSimpleText(run, x, includePartialGlyphs);