Changeset 268638 in webkit

Timestamp:

Oct 17, 2020 12:06:23 AM (4 years ago)

Author:

mmaxfield@apple.com

Message:

REGRESSION(r268561): Synthetic oblique text is drawn upside-down
​https://bugs.webkit.org/show_bug.cgi?id=217867
<rdar://problem/70400846>

Reviewed by Darin Adler.

Source/WebCore:

I made a typo.

Test: fast/text/synthetic-oblique.html

• platform/graphics/FontCascade.h:

(WebCore::FontCascade::syntheticObliqueAngle):

• platform/graphics/coretext/FontCascadeCoreText.cpp:

(WebCore::computeOverallTextMatrix):

LayoutTests:

• fast/text/synthetic-oblique-expected.html: Added.
• fast/text/synthetic-oblique.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/synthetic-oblique-expected-mismatch.html (added)
• LayoutTests/fast/text/synthetic-oblique.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/FontCascade.h (modified) (1 diff)
• Source/WebCore/platform/graphics/coretext/FontCascadeCoreText.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-10-17  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        REGRESSION(r268561): Synthetic oblique text is drawn upside-down
+        https://bugs.webkit.org/show_bug.cgi?id=217867
+        <rdar://problem/70400846>
+
+        Reviewed by Darin Adler.
+
+        * fast/text/synthetic-oblique-expected.html: Added.
+        * fast/text/synthetic-oblique.html: Added.
+
 2020-10-16  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-17  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        REGRESSION(r268561): Synthetic oblique text is drawn upside-down
+        https://bugs.webkit.org/show_bug.cgi?id=217867
+        <rdar://problem/70400846>
+
+        Reviewed by Darin Adler.
+
+        I made a typo.
+
+        Test: fast/text/synthetic-oblique.html
+
+        * platform/graphics/FontCascade.h:
+        (WebCore::FontCascade::syntheticObliqueAngle):
+        * platform/graphics/coretext/FontCascadeCoreText.cpp:
+        (WebCore::computeOverallTextMatrix):
+
 2020-10-16  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

trunk/Source/WebCore/platform/graphics/FontCascade.h

@@ -197 +197 @@
     bool primaryFontIsSystemFont() const;
 
-    static int syntheticObliqueAngle() { return 14; }
+    static float syntheticObliqueAngle() { return 14; }
 
     std::unique_ptr<DisplayList::DisplayList> displayListForTextRun(GraphicsContext&, const TextRun&, unsigned from = 0, Optional<unsigned> to = { }, CustomFontNotReadyAction = CustomFontNotReadyAction::DoNotPaintIfFontNotReady) const;

trunk/Source/WebCore/platform/graphics/coretext/FontCascadeCoreText.cpp

@@ -147 +147 @@
     result.setD(-result.d());
     if (platformData.syntheticOblique()) {
-        float obliqueSkew = tanf(FontCascade::syntheticObliqueAngle() * piFloat / 180);
+        float obliqueSkew = tanf(deg2rad(FontCascade::syntheticObliqueAngle()));
         if (platformData.orientation() == FontOrientation::Vertical) {
             if (font.isTextOrientationFallback())
@@ -154 +154 @@
                 result = AffineTransform(1, -obliqueSkew, 0, 1, 0, 0) * result;
         } else
-            result = AffineTransform(1, 0, -obliqueSkew, 1, 0, 0);
+            result = AffineTransform(1, 0, -obliqueSkew, 1, 0, 0) * result;
     }