diff options
| author |  caryclark <caryclark@google.com> | 2015-07-23 12:38:59 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-23 12:38:59 -0700 |
| commit | a0170f10aadca337fc412953f3409eb368c6964b (patch) | |
| tree | 5edf6beb4617e67fd4f4c370715ab742c1c2f5ee /gm/dftext.cpp | |
| parent | a449779a330123062e752228de8e3f84593a6fd1 (diff) | |
make dftext the same on Linux and Android
Use the same font sizes on both platforms so that the gm images
are easier to compare one to the other.
TBR=jvanverth@google.com
Review URL: https://codereview.chromium.org/1253573006
Diffstat (limited to 'gm/dftext.cpp')
| -rwxr-xr-x | gm/dftext.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/gm/dftext.cpp b/gm/dftext.cpp index 1a46baffb3..5ccdf21749 100755 --- a/gm/dftext.cpp +++ b/gm/dftext.cpp @@ -42,11 +42,7 @@ protected: } virtual void onDraw(SkCanvas* inputCanvas) override { -#ifdef SK_BUILD_FOR_ANDROID SkScalar textSizes[] = { 9.0f, 9.0f*2.0f, 9.0f*5.0f, 9.0f*2.0f*5.0f }; -#else - SkScalar textSizes[] = { 11.0f, 11.0f*2.0f, 11.0f*5.0f, 11.0f*2.0f*5.0f }; -#endif SkScalar scales[] = { 2.0f*5.0f, 5.0f, 2.0f, 1.0f }; // set up offscreen rendering with distance field text @@ -155,11 +151,7 @@ protected: x = SkIntToScalar(680); y = SkIntToScalar(270); -#ifdef SK_BUILD_FOR_ANDROID paint.setTextSize(SkIntToScalar(19)); -#else - paint.setTextSize(SkIntToScalar(22)); -#endif for (size_t i = 0; i < SK_ARRAY_COUNT(fg); ++i) { paint.setColor(fg[i]); @@ -173,11 +165,7 @@ protected: x = SkIntToScalar(830); y = SkIntToScalar(270); -#ifdef SK_BUILD_FOR_ANDROID paint.setTextSize(SkIntToScalar(19)); -#else - paint.setTextSize(SkIntToScalar(22)); -#endif for (size_t i = 0; i < SK_ARRAY_COUNT(fg); ++i) { paint.setColor(fg[i]); |