Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(308)

Unified Diff: sky/engine/platform/fonts/harfbuzz/FontHarfBuzz.cpp

Issue 1241673004: Minor sky/engine updates for Mac target (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Remove file added as a result of a bad merge Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sky/engine/platform/fonts/harfbuzz/FontHarfBuzz.cpp
diff --git a/sky/engine/platform/fonts/harfbuzz/FontHarfBuzz.cpp b/sky/engine/platform/fonts/harfbuzz/FontHarfBuzz.cpp
index 50e95c6758b6cd445654e9fd0bfd8d7504621fd1..7a4f278742d18d680795eddb3ed676e0a0a4227e 100644
--- a/sky/engine/platform/fonts/harfbuzz/FontHarfBuzz.cpp
+++ b/sky/engine/platform/fonts/harfbuzz/FontHarfBuzz.cpp
@@ -124,6 +124,8 @@ void Font::drawGlyphs(GraphicsContext* gc, const SimpleFontData* font,
SkScalar x = SkFloatToScalar(point.x());
SkScalar y = SkFloatToScalar(point.y());
+// ENABLE_OPENTYPE_VERTICAL is not enabled on MACOSX
+#if !OS(MACOSX)
const OpenTypeVerticalData* verticalData = font->verticalData();
if (font->platformData().orientation() == Vertical && verticalData) {
SkAutoSTMalloc<32, SkPoint> storage(numGlyphs);
@@ -165,6 +167,7 @@ void Font::drawGlyphs(GraphicsContext* gc, const SimpleFontData* font,
gc->setCTM(savedMatrix);
return;
}
+#endif
if (!glyphBuffer.hasOffsets()) {
SkAutoSTMalloc<64, SkScalar> storage(numGlyphs);
« no previous file with comments | « sky/engine/platform/fonts/apple/FontPlatformDataApple.cpp ('k') | sky/engine/platform/fonts/ios/FontPlatformDataIOS.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698