diff options
| author | bsalomon <bsalomon@google.com> | 2015-12-07 13:11:42 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-07 21:13:08 +0000 |
| commit | 229b1db0ba46a2b3d82b0acfecd13702f0725996 (patch) | |
| tree | 6d8061acbb8497312a0985595d634cfcfad58197 /skia | |
| parent | fd1b464488f8c54b6dac7415b3ba4d7b2ee02586 (diff) | |
| download | chromium_src-229b1db0ba46a2b3d82b0acfecd13702f0725996.zip chromium_src-229b1db0ba46a2b3d82b0acfecd13702f0725996.tar.gz chromium_src-229b1db0ba46a2b3d82b0acfecd13702f0725996.tar.bz2 | |
Add SK_IGNORE_GL_TEXTURE_TARGET to SkUserConfig.h
This will allow an atomic change that makes Chrome use the new GrGLTextureInfo object and undefines this macro. Currently the macro is defined in a gyp file in the skia repository on behalf of Chrome.
BUG=551072
Review URL: https://codereview.chromium.org/1509443003
Cr-Commit-Position: refs/heads/master@{#363583}
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/config/SkUserConfig.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h index 61786ad..1e688f5 100644 --- a/skia/config/SkUserConfig.h +++ b/skia/config/SkUserConfig.h @@ -241,6 +241,9 @@ SK_API void SkDebugf_FileLine(const char* file, int line, bool fatal, */ #define SK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS +#ifndef SK_IGNORE_GL_TEXTURE_TARGET +# define SK_IGNORE_GL_TEXTURE_TARGET +#endif #define SK_IGNORE_BLURRED_RRECT_OPT #define SK_USE_DISCARDABLE_SCALEDIMAGECACHE #define SK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT |