diff options
| author |  jvanverth <jvanverth@google.com> | 2014-11-06 13:52:45 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-11-06 13:52:45 -0800 |
| commit | aa30ab3079ad3c1f408e3f170dac1cdd42ed2b62 (patch) | |
| tree | bca7bf2584494be08b4e2e0905a39709c436b424 /gyp | |
| parent | 06ba179838ba4fe187cf290750aeeb4a02a2960b (diff) | |
Revert of Get gpudft support working in dm, gm, nanobench and bench_pictures (patchset #2 id:20001 of https://codereview.chromium.org/699453005/)
Reason for revert:
Not compiling in ANGLE build
Original issue's description:
> Get gpudft support working in dm, gm, nanobench and bench_pictures
>
> Adds a new config to test distance field text.
> Clean up some flags and #defines to read "distance field text",
> not "distance field fonts" to be consistent with Chromium
>
> NOTREECHECKS=true
>
> Committed: https://skia.googlesource.com/skia/+/06ba179838ba4fe187cf290750aeeb4a02a2960b
TBR=bsalomon@google.com,mtklein@google.com,reed@google.com
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/707723005
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_conditions.gypi | 2 | ||||
| -rw-r--r-- | gyp/common_variables.gypi | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index dd701dda82..d9c048771e 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -5,7 +5,7 @@ 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', 'SK_SUPPORT_GPU=<(skia_gpu)', 'SK_SUPPORT_OPENCL=<(skia_opencl)', - 'SK_FORCE_DISTANCE_FIELD_TEXT=<(skia_force_distance_field_text)', + 'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)', ], 'conditions' : [ ['skia_pic', { diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index 09d84ec399..ab25eeff43 100644 --- a/gyp/common_variables.gypi +++ b/gyp/common_variables.gypi @@ -152,7 +152,7 @@ 'skia_win_debuggers_path%': '', 'skia_shared_lib%': 0, 'skia_opencl%': 0, - 'skia_force_distance_field_text%': 0, + 'skia_force_distancefield_fonts%': 0, # These variables determine the default optimization level for different # compilers. @@ -231,7 +231,7 @@ 'skia_profile_enabled%': '<(skia_profile_enabled)', 'skia_shared_lib%': '<(skia_shared_lib)', 'skia_opencl%': '<(skia_opencl)', - 'skia_force_distance_field_text%': '<(skia_force_distance_field_text)', + 'skia_force_distancefield_fonts%': '<(skia_force_distancefield_fonts)', 'skia_static_initializers%': '<(skia_static_initializers)', 'ios_sdk_version%': '6.0', 'skia_win_debuggers_path%': '<(skia_win_debuggers_path)', |