diff options
| author | bungeman@chromium.org <bungeman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-30 21:07:15 +0000 |
|---|---|---|
| committer | bungeman@chromium.org <bungeman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-30 21:07:15 +0000 |
| commit | 4223795091e964679cedb5b70cabc7bee277395e (patch) | |
| tree | de62744d751df38d571aa60ef45c58b42a422240 /skia/skia.gyp | |
| parent | f85313a7d1d03c27abea107fd1b88b9fe50ae8cc (diff) | |
| download | chromium_src-4223795091e964679cedb5b70cabc7bee277395e.zip chromium_src-4223795091e964679cedb5b70cabc7bee277395e.tar.gz chromium_src-4223795091e964679cedb5b70cabc7bee277395e.tar.bz2 | |
Revert 165005 - Modifications to skia.gyp for WebKit side code suppressions.
This change would be made after
https://bugs.webkit.org/show_bug.cgi?id=99759
is committed, and there is a WebKit roll into Chromium.
Review URL: https://codereview.chromium.org/11191074
TBR=bungeman@chromium.org
Review URL: https://codereview.chromium.org/11273124
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165008 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia.gyp')
| -rw-r--r-- | skia/skia.gyp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index f3b4f82..1864d93 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -14,12 +14,6 @@ }, { 'skia_support_gpu': 1, }], - - ['inside_chromium_build==0', { - 'webkit_src_dir': '<(DEPTH)/../../..', - },{ - 'webkit_src_dir': '<(DEPTH)/third_party/WebKit', - }], ], 'optimize': 'max', @@ -226,12 +220,23 @@ # this flag can be removed entirely once this has baked for a while 'SK_ALLOW_OVER_32K_BITMAPS', + # temporary for landing Skia rev 3077 with minimal layout test breakage + 'SK_SIMPLE_TWOCOLOR_VERTICAL_GRADIENTS', + # skia uses static initializers to initialize the serialization logic # of its "pictures" library. This is currently not used in chrome; if # it ever gets used the processes that use it need to call # SkGraphics::Init(). 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0', + # Temporarily disable the Skia fix in + # http://code.google.com/p/skia/source/detail?r=3037 ; enabling that + # fix will require substantial rebaselining. + 'SK_DRAW_POS_TEXT_IGNORE_SUBPIXEL_LEFT_ALIGN_FIX', + + # Temporarily ignore fix to antialias coverage, until we can rebaseline + 'SK_USE_LEGACY_AA_COVERAGE', + # Temporarily keep old int-srcrect behavior, until we determine if # the few failures are a bug or not. 'SK_SUPPORT_INT_SRCRECT_DRAWBITMAPRECT', @@ -552,8 +557,6 @@ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../third_party/sfntly/sfntly.gyp:sfntly', '../third_party/zlib/zlib.gyp:zlib', - - '<(webkit_src_dir)/Source/WebKit/chromium/skia_webkit.gyp:skia_webkit', ], 'direct_dependent_settings': { 'include_dirs': [ |