Title: [146456] trunk/Source/WebCore
- Revision
- 146456
- Author
- r...@google.com
- Date
- 2013-03-21 05:49:44 -0700 (Thu, 21 Mar 2013)
Log Message
Remove obsolete conditionals around calling SkTypeface::getUnitsPerEm()
https://bugs.webkit.org/show_bug.cgi?id=112846
Reviewed by Stephen White.
Existing complex-text layouttests exercise this code.
* platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.cpp:
(WebCore::FontPlatformData::emSizeInFontUnits):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (146455 => 146456)
--- trunk/Source/WebCore/ChangeLog 2013-03-21 12:28:55 UTC (rev 146455)
+++ trunk/Source/WebCore/ChangeLog 2013-03-21 12:49:44 UTC (rev 146456)
@@ -1,3 +1,15 @@
+2013-03-21 Mike Reed <r...@google.com>
+
+ Remove obsolete conditionals around calling SkTypeface::getUnitsPerEm()
+ https://bugs.webkit.org/show_bug.cgi?id=112846
+
+ Reviewed by Stephen White.
+
+ Existing complex-text layouttests exercise this code.
+
+ * platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.cpp:
+ (WebCore::FontPlatformData::emSizeInFontUnits):
+
2013-03-21 Stephen White <senorbla...@chromium.org>
[skia] feConvolveMatrix should use accelerated path
Modified: trunk/Source/WebCore/platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.cpp (146455 => 146456)
--- trunk/Source/WebCore/platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.cpp 2013-03-21 12:28:55 UTC (rev 146455)
+++ trunk/Source/WebCore/platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.cpp 2013-03-21 12:49:44 UTC (rev 146456)
@@ -165,17 +165,7 @@
if (m_emSizeInFontUnits)
return m_emSizeInFontUnits;
- // FIXME: Switch to the SkTypeface::GetUnitsPerEm API once this becomes available.
- // https://bugs.webkit.org/show_bug.cgi?id=75961
-#if OS(ANDROID)
- // Android doesn't currently support Skia's getAdvancedTypefaceMetrics(),
- // but it has access to another method to replace this functionality.
m_emSizeInFontUnits = m_typeface->getUnitsPerEm();
-#else
- SkAdvancedTypefaceMetrics* metrics = m_typeface->getAdvancedTypefaceMetrics(SkAdvancedTypefaceMetrics::kNo_PerGlyphInfo);
- m_emSizeInFontUnits = metrics->fEmSize;
- metrics->unref();
-#endif
return m_emSizeInFontUnits;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
