Changeset 269823 in webkit

Timestamp:

Nov 15, 2020, 12:56:23 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Font::platformBoundsForGlyph() should provide a boundingRect pointer to CTFontGetBoundingRectsForGlyphs()
​https://bugs.webkit.org/show_bug.cgi?id=218812

Patch by Julian Gonzalez <​julian_a_gonzalez@apple.com> on 2020-11-15
Reviewed by Ryosuke Niwa.

Provide a zero CGRect boundingRect pointer in two places where the count argument
to CTFontGetBoundingRectsForGlyphs() is already 1.

No new tests, no behavior changes.

• platform/graphics/coretext/FontCoreText.cpp:

(WebCore::Font::platformBoundsForGlyph const):
(WebCore::Font::isProbablyOnlyUsedToRenderIcons const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/coretext/FontCoreText.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-11-15  Julian Gonzalez  <julian_a_gonzalez@apple.com>
+
+        Font::platformBoundsForGlyph() should provide a boundingRect pointer to CTFontGetBoundingRectsForGlyphs()
+        https://bugs.webkit.org/show_bug.cgi?id=218812
+
+        Reviewed by Ryosuke Niwa.
+
+        Provide a zero CGRect boundingRect pointer in two places where the count argument
+        to CTFontGetBoundingRectsForGlyphs() is already 1.
+
+        No new tests, no behavior changes.
+
+        * platform/graphics/coretext/FontCoreText.cpp:
+        (WebCore::Font::platformBoundsForGlyph const):
+        (WebCore::Font::isProbablyOnlyUsedToRenderIcons const):
+
 2020-11-14  Simon Fraser  <simon.fraser@apple.com>
 

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

@@ -700 +700 @@
 {
     FloatRect boundingBox;
-    boundingBox = CTFontGetBoundingRectsForGlyphs(m_platformData.ctFont(), platformData().orientation() == FontOrientation::Vertical ? kCTFontOrientationVertical : kCTFontOrientationHorizontal, &glyph, 0, 1);
+    CGRect emptyRect;
+    boundingBox = CTFontGetBoundingRectsForGlyphs(m_platformData.ctFont(), platformData().orientation() == FontOrientation::Vertical ? kCTFontOrientationVertical : kCTFontOrientationHorizontal, &glyph, &emptyRect, 1);
     boundingBox.setY(-boundingBox.maxY());
     if (m_syntheticBoldOffset)
@@ -744 +745 @@
     CGGlyph lowercaseAGlyph;
     if (CTFontGetGlyphsForCharacters(platformFont, &lowercaseACharacter, &lowercaseAGlyph, 1)) {
-        if (!CGRectIsEmpty(CTFontGetBoundingRectsForGlyphs(platformFont, kCTFontOrientationDefault, &lowercaseAGlyph, nullptr, 1)))
+        CGRect emptyRect;
+        if (!CGRectIsEmpty(CTFontGetBoundingRectsForGlyphs(platformFont, kCTFontOrientationDefault, &lowercaseAGlyph, &emptyRect, 1)))
             return false;
     }