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

Unified Diff: gm/androidfallback.cpp

Issue 208313014: gather GM tests which are disabled on Android (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: add links to bugs Created 6 years, 9 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
« no previous file with comments | « no previous file | gm/bitmapcopy.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gm/androidfallback.cpp
diff --git a/gm/androidfallback.cpp b/gm/androidfallback.cpp
index 62fbcc97db8c5680c0a682b46aaa0739cadf49e3..e3d7dd39532dc8e358536f906ceb5a7590551817 100644
--- a/gm/androidfallback.cpp
+++ b/gm/androidfallback.cpp
@@ -35,11 +35,9 @@ protected:
paint.setTextEncoding(SkPaint::kUTF16_TextEncoding);
paint.setTextSize(24);
-#ifdef SK_BUILD_FOR_ANDROID
SkPaintOptionsAndroid options = paint.getPaintOptionsAndroid();
options.setUseFontFallbacks(true);
paint.setPaintOptionsAndroid(options);
-#endif
// "ื foo ๅ…่ˆŒ bar เค•"
const uint16_t unicodeStr[] = {0x05D0, 0x0020, 0x0066, 0x006F, 0x006F, 0x0020, 0x514D,
@@ -63,10 +61,8 @@ protected:
canvas->translate(0, SkIntToScalar(75));
canvas->drawPosTextH(unicodeStr, strByteLength, posX, 0, paint);
-#ifdef SK_BUILD_FOR_ANDROID
options.setLanguage("ja");
paint.setPaintOptionsAndroid(options);
-#endif
canvas->translate(0, SkIntToScalar(75));
canvas->drawPosText(unicodeStr, strByteLength, posXY, paint);
@@ -85,8 +81,6 @@ private:
//////////////////////////////////////////////////////////////////////////////
-#ifdef SK_BUILD_FOR_ANDROID
DEF_GM( return SkNEW(AndroidFallbackGM); )
-#endif
}
« no previous file with comments | « no previous file | gm/bitmapcopy.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698