Changeset 152690 in webkit

Timestamp:

Jul 15, 2013, 6:21:14 PM (12 years ago)

Author:

Lucas Forschler

Message:

Merged r152653. <rdar://problem/14442444>

Location:

branches/safari-537-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/svg/text/text-overflow-ellipsis-svgfont-kerning-ligatures-expected.png (copied) (copied from trunk/LayoutTests/platform/mac/svg/text/text-overflow-ellipsis-svgfont-kerning-ligatures-expected.png )
• LayoutTests/platform/mac/svg/text/text-overflow-ellipsis-svgfont-kerning-ligatures-expected.txt (copied) (copied from trunk/LayoutTests/platform/mac/svg/text/text-overflow-ellipsis-svgfont-kerning-ligatures-expected.txt )
• LayoutTests/svg/text/text-overflow-ellipsis-svgfont-kerning-ligatures.html (copied) (copied from trunk/LayoutTests/svg/text/text-overflow-ellipsis-svgfont-kerning-ligatures.html )
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/Font.cpp (modified) (3 diffs)

branches/safari-537-branch/LayoutTests/ChangeLog

@@ +1 @@
+2013-07-15  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r152653
+
+    2013-07-15  Antoine Quint  <graouts@apple.com>
+
+            Text with "text-overflow:ellipsis" and an SVG font do not render correctly
+            https://bugs.webkit.org/show_bug.cgi?id=118669
+
+            Reviewed by David Kilzer.
+
+            * platform/mac/svg/text/text-overflow-ellipsis-svgfont-kerning-ligatures-expected.png: Added.
+            * platform/mac/svg/text/text-overflow-ellipsis-svgfont-kerning-ligatures-expected.txt: Added.
+            * svg/text/text-overflow-ellipsis-svgfont-kerning-ligatures.html: Added.
+
 2013-07-15  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-537-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2013-07-15  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r152653
+
+    2013-07-15  Antoine Quint  <graouts@apple.com>
+
+            Text with "text-overflow:ellipsis" and an SVG font do not render correctly
+            https://bugs.webkit.org/show_bug.cgi?id=118669
+
+            Reviewed by David Kilzer.
+
+            Partial runs may be routed through the complex path in several Font functions. While incomplete,
+            we can check for a non-NULL run.renderingContext() and exempt runs that have it from being forced
+            down the complex path. A more thorough fix is already tracked by http://webkit.org/b/100050.
+
+            Adding a new testcase which is a copy of svg/text/text-overflow-ellipsis-svgfont.html with kerning
+            and ligatures turned on explicitly since DRT runs with those off by default and this option is required
+            to be on for the issue to reproduce.
+
+            Fix courtesy of Dan Bernstein.
+
+            Test: svg/text/text-overflow-ellipsis-svgfont-kerning-ligatures.html
+
+            * platform/graphics/Font.cpp:
+            (WebCore::Font::drawText):
+            (WebCore::Font::drawEmphasisMarks):
+            (WebCore::Font::selectionRectForText):
+
 2013-07-15  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-537-branch/Source/WebCore/platform/graphics/Font.cpp

@@ -267 +267 @@
     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()))
+    if (codePathToUse != Complex && typesettingFeatures() && (from || to != run.length()) && !run.renderingContext())
         codePathToUse = Complex;
 
@@ -286 +286 @@
     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()))
+    if (codePathToUse != Complex && typesettingFeatures() && (from || to != run.length()) && !run.renderingContext())
         codePathToUse = Complex;
 
@@ -363 +363 @@
     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()))
+    if (codePathToUse != Complex && typesettingFeatures() && (from || to != run.length()) && !run.renderingContext())
         codePathToUse = Complex;