diff options
| author | tdanderson@chromium.org <tdanderson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-10 06:10:25 +0000 |
|---|---|---|
| committer | tdanderson@chromium.org <tdanderson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-10 06:10:25 +0000 |
| commit | 50a4c4171678537494370d07c44c693762b956db (patch) | |
| tree | f113b6018723f5d7f02a13ef59716c09548a7781 /skia | |
| parent | 7573f4933330825b60783d765a11c46bd6dbf138 (diff) | |
| download | chromium_src-50a4c4171678537494370d07c44c693762b956db.zip chromium_src-50a4c4171678537494370d07c44c693762b956db.tar.gz chromium_src-50a4c4171678537494370d07c44c693762b956db.tar.bz2 | |
Only define SK_SUPPORT_HINTING_SCALE_FACTOR when building for chromeOS
This is causing some problems with picture serialization between chrome and the
mainline skia tools. Depends on https://bugs.webkit.org/show_bug.cgi?id=98526
landing and being gardened in first.
BUG=none
Review URL: https://chromiumcodereview.appspot.com/11038066
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161060 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia.gyp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 58eb437..747427c 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -242,11 +242,6 @@ # Temporarily ignore fix to antialias coverage, until we can rebaseline 'SK_USE_LEGACY_AA_COVERAGE', - # Temporarily use SkPaint to keep a scale factor needed for correct - # font rendering in high DPI mode. - # See https://codereview.appspot.com/6495089/ - 'SK_SUPPORT_HINTING_SCALE_FACTOR', - # Temporarily keep old int-srcrect behavior, until we determine if # the few failures are a bug or not. 'SK_SUPPORT_INT_SRCRECT_DRAWBITMAPRECT', @@ -340,6 +335,14 @@ [ 'OS != "win"', { 'sources/': [ ['exclude', '_win\\.(cc|cpp)$'] ], }], + [ 'chromeos == 1', { + 'defines': [ + # Temporarily use SkPaint to keep a scale factor needed for correct + # font rendering in high DPI mode. + # See https://codereview.appspot.com/6495089/ + 'SK_SUPPORT_HINTING_SCALE_FACTOR', + ], + }], [ 'armv7 == 1', { 'defines': [ '__ARM_ARCH__=7', @@ -583,9 +586,13 @@ 'SK_DEFERRED_CANVAS_USES_GPIPE=1', 'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"', 'GR_AGGRESSIVE_SHADER_OPTS=1', - 'SK_SUPPORT_HINTING_SCALE_FACTOR', ], 'conditions': [ + [ 'chromeos == 1', { + 'defines': [ + 'SK_SUPPORT_HINTING_SCALE_FACTOR', + ], + }], ['OS=="android"', { 'dependencies!': [ 'skia_opts', |