diff options
author | Ben Murdoch <benm@google.com> | 2010-05-12 12:23:21 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-05-14 12:25:47 +0100 |
commit | e1a050511f7c6f4fb978049f2b183710f8892293 (patch) | |
tree | 0aacf36a51d09d60a974cc9387771695fc9982f6 /WebCore | |
parent | 4c02d6a0244d7e6a7172e1f72aa514c7f68b1cea (diff) | |
download | external_webkit-e1a050511f7c6f4fb978049f2b183710f8892293.zip external_webkit-e1a050511f7c6f4fb978049f2b183710f8892293.tar.gz external_webkit-e1a050511f7c6f4fb978049f2b183710f8892293.tar.bz2 |
Merge Webkit at r58956: Remove GlyphMetrics from Font code. See http://trac.webkit.org/changeset/58192
Change-Id: I2b3876f4027d2d3afbf0cfaa76061c53d0bf018f
Diffstat (limited to 'WebCore')
-rw-r--r-- | WebCore/platform/graphics/android/FontDataAndroid.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/WebCore/platform/graphics/android/FontDataAndroid.cpp b/WebCore/platform/graphics/android/FontDataAndroid.cpp index c9b1d37..535844e 100644 --- a/WebCore/platform/graphics/android/FontDataAndroid.cpp +++ b/WebCore/platform/graphics/android/FontDataAndroid.cpp @@ -95,7 +95,12 @@ void SimpleFontData::determinePitch() m_treatAsFixedPitch = false; } -GlyphMetrics SimpleFontData::platformMetricsForGlyph(Glyph glyph, GlyphMetricsMode) const +FloatRect SimpleFontData::platformBoundsForGlyph(Glyph) const +{ + return FloatRect(); +} + +float SimpleFontData::platformWidthForGlyph(Glyph glyph) const { SkASSERT(sizeof(glyph) == 2); // compile-time assert @@ -110,9 +115,8 @@ GlyphMetrics SimpleFontData::platformMetricsForGlyph(Glyph glyph, GlyphMetricsMo paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding); advanceWidth = SkScalarToFloat(paint.measureText(&glyph, 2)); } - GlyphMetrics metrics; - metrics.horizontalAdvance = advanceWidth; - return metrics; + return advanceWidth; } + } |