Title: [181862] trunk/Source/WebCore
- Revision
- 181862
- Author
- [email protected]
- Date
- 2015-03-23 13:17:32 -0700 (Mon, 23 Mar 2015)
Log Message
Fixed the build.
* platform/graphics/cocoa/FontCocoa.mm:
(WebCore::Font::platformBoundsForGlyph): Switched to non-deprecated CTFontOrientation values.
(WebCore::Font::platformWidthForGlyph): Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (181861 => 181862)
--- trunk/Source/WebCore/ChangeLog 2015-03-23 20:06:02 UTC (rev 181861)
+++ trunk/Source/WebCore/ChangeLog 2015-03-23 20:17:32 UTC (rev 181862)
@@ -1,3 +1,11 @@
+2015-03-23 Dan Bernstein <[email protected]>
+
+ Fixed the build.
+
+ * platform/graphics/cocoa/FontCocoa.mm:
+ (WebCore::Font::platformBoundsForGlyph): Switched to non-deprecated CTFontOrientation values.
+ (WebCore::Font::platformWidthForGlyph): Ditto.
+
2015-03-23 Jer Noble <[email protected]>
[iOS] Accessibility crashing because MediaPlayer is laying out UI off the main thread
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm (181861 => 181862)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2015-03-23 20:06:02 UTC (rev 181861)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2015-03-23 20:17:32 UTC (rev 181862)
@@ -405,7 +405,7 @@
FloatRect Font::platformBoundsForGlyph(Glyph glyph) const
{
FloatRect boundingBox;
- boundingBox = CTFontGetBoundingRectsForGlyphs(m_platformData.ctFont(), platformData().orientation() == Vertical ? kCTFontVerticalOrientation : kCTFontHorizontalOrientation, &glyph, 0, 1);
+ boundingBox = CTFontGetBoundingRectsForGlyphs(m_platformData.ctFont(), platformData().orientation() == Vertical ? kCTFontOrientationVertical : kCTFontOrientationHorizontal, &glyph, 0, 1);
boundingBox.setY(-boundingBox.maxY());
if (m_syntheticBoldOffset)
boundingBox.setWidth(boundingBox.width() + m_syntheticBoldOffset);
@@ -499,7 +499,7 @@
advance.width = 0;
}
} else if (!populatedAdvance)
- CTFontGetAdvancesForGlyphs(m_platformData.ctFont(), horizontal ? kCTFontHorizontalOrientation : kCTFontVerticalOrientation, &glyph, &advance, 1);
+ CTFontGetAdvancesForGlyphs(m_platformData.ctFont(), horizontal ? kCTFontOrientationHorizontal : kCTFontOrientationVertical, &glyph, &advance, 1);
return advance.width + m_syntheticBoldOffset;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
