diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-24 20:07:44 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-24 20:07:44 +0000 |
| commit | 7b78981b4cb2a33b937c0b4e7f34ca07c5dfd6d5 (patch) | |
| tree | c148ed5846658628d7e65b14b9b1d8fba3457160 /gm | |
| parent | 41056232e471e0f5448e88dabe0ef4c5e50f21e6 (diff) | |
gather GM tests which are disabled on Android
BUG=skia:2326
R=borenet@google.com, djsollen@google.com
Author: epoger@google.com
Review URL: https://codereview.chromium.org/208313014
git-svn-id: http://skia.googlecode.com/svn/trunk@13922 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/androidfallback.cpp | 6 | ||||
| -rw-r--r-- | gm/bitmapcopy.cpp | 2 | ||||
| -rw-r--r-- | gm/coloremoji.cpp | 3 | ||||
| -rw-r--r-- | gm/drawbitmaprect.cpp | 2 | ||||
| -rw-r--r-- | gm/shadertext.cpp | 2 | ||||
| -rw-r--r-- | gm/shadertext2.cpp | 2 | ||||
| -rw-r--r-- | gm/shadertext3.cpp | 2 | ||||
| -rw-r--r-- | gm/verylargebitmap.cpp | 3 |
8 files changed, 0 insertions, 22 deletions
diff --git a/gm/androidfallback.cpp b/gm/androidfallback.cpp index 62fbcc97db..e3d7dd3953 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 } diff --git a/gm/bitmapcopy.cpp b/gm/bitmapcopy.cpp index 68db908024..36b711e994 100644 --- a/gm/bitmapcopy.cpp +++ b/gm/bitmapcopy.cpp @@ -121,8 +121,6 @@ private: ////////////////////////////////////////////////////////////////////////////// -#ifndef SK_BUILD_FOR_ANDROID static GM* MyFactory(void*) { return new BitmapCopyGM; } static GMRegistry reg(MyFactory); -#endif } diff --git a/gm/coloremoji.cpp b/gm/coloremoji.cpp index 03405a5cac..8497521582 100644 --- a/gm/coloremoji.cpp +++ b/gm/coloremoji.cpp @@ -109,10 +109,7 @@ private: ////////////////////////////////////////////////////////////////////////////// -#if !defined(SK_BUILD_FOR_ANDROID) -// fail for now until the appropriate freetype changes are submitted static GM* MyFactory(void*) { return new ColorEmojiGM; } static GMRegistry reg(MyFactory); -#endif } diff --git a/gm/drawbitmaprect.cpp b/gm/drawbitmaprect.cpp index 664958a06b..92e0c384f5 100644 --- a/gm/drawbitmaprect.cpp +++ b/gm/drawbitmaprect.cpp @@ -178,8 +178,6 @@ private: ////////////////////////////////////////////////////////////////////////////// -#ifndef SK_BUILD_FOR_ANDROID static GM* MyFactory(void*) { return new DrawBitmapRectGM; } static GMRegistry reg(MyFactory); -#endif } diff --git a/gm/shadertext.cpp b/gm/shadertext.cpp index 4af5b0d49d..02b90926a3 100644 --- a/gm/shadertext.cpp +++ b/gm/shadertext.cpp @@ -207,8 +207,6 @@ private: /////////////////////////////////////////////////////////////////////////////// -#ifndef SK_BUILD_FOR_ANDROID static GM* MyFactory(void*) { return new ShaderTextGM; } static GMRegistry reg(MyFactory); -#endif } diff --git a/gm/shadertext2.cpp b/gm/shadertext2.cpp index 1e6ae5ca2c..f839161dae 100644 --- a/gm/shadertext2.cpp +++ b/gm/shadertext2.cpp @@ -214,8 +214,6 @@ private: /////////////////////////////////////////////////////////////////////////////// -#ifndef SK_BUILD_FOR_ANDROID static GM* MyFactory(void*) { return new ShaderText2GM; } static GMRegistry reg(MyFactory); -#endif } diff --git a/gm/shadertext3.cpp b/gm/shadertext3.cpp index 29ceac4579..48093eb186 100644 --- a/gm/shadertext3.cpp +++ b/gm/shadertext3.cpp @@ -136,8 +136,6 @@ private: /////////////////////////////////////////////////////////////////////////////// -#ifndef SK_BUILD_FOR_ANDROID static GM* MyFactory(void*) { return new ShaderText3GM; } static GMRegistry reg(MyFactory); -#endif } diff --git a/gm/verylargebitmap.cpp b/gm/verylargebitmap.cpp index e0a4618130..6eca701cc7 100644 --- a/gm/verylargebitmap.cpp +++ b/gm/verylargebitmap.cpp @@ -119,8 +119,5 @@ private: ////////////////////////////////////////////////////////////////////////////// -// This GM allocates more memory than Android devices are capable of fulfilling. -#ifndef SK_BUILD_FOR_ANDROID static skiagm::GM* MyFactory(void*) { return new VeryLargeBitmapGM; } static skiagm::GMRegistry reg(MyFactory); -#endif |