summaryrefslogtreecommitdiffstats
path: root/skia/skia.gyp
diff options
context:
space:
mode:
authorzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-03 18:59:32 +0000
committerzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-03 18:59:32 +0000
commitb271b9e734d54c43a8434ba4c92b07518a473c88 (patch)
treeb5c6b43382b8ca9ded5f17bd29ddad286363cf5f /skia/skia.gyp
parentee9c49641afade5f6a5d38ed413e505293ba59e1 (diff)
downloadchromium_src-b271b9e734d54c43a8434ba4c92b07518a473c88.zip
chromium_src-b271b9e734d54c43a8434ba4c92b07518a473c88.tar.gz
chromium_src-b271b9e734d54c43a8434ba4c92b07518a473c88.tar.bz2
Revert 170740
Broke bunch of layout tests on Mac: canvas/philip/tests/2d.text.draw.align.center.html,canvas/philip/tests/2d.text.draw.align.end.ltr.html,canvas/philip/tests/2d.text.draw.align.end.rtl.html,canvas/philip/tests/2d.text.draw.align.left.html,canvas/philip/tests/2d.text.draw.align.right.html,canvas/philip/tests/2d.text.draw.align.start.ltr.html,canvas/philip/tests/2d.text.draw.align.start.rtl.html,canvas/philip/tests/2d.text.draw.baseline.alphabetic.html,canvas/philip/tests/2d.text.draw.baseline.ideographic.html,canvas/philip/tests/2d.text.draw.fill.maxWidth.bound.html,canvas/philip/tests/2d.text.draw.fontface.html,canvas/philip/tests/2d.text.draw.fontface.repeat.html,canvas/philip/tests/2d.text.draw.space.basic.html,canvas/philip/tests/2d.text.draw.space.collapse.nonspace.html,platform/chromium/virtual/gpu/canvas/philip/tests/2d.text.draw.align.center.html,platform/chromium/virtual/gpu/canvas/philip/tests/2d.text.draw.align.end.ltr.html,platform/chromium/virtual/gpu/canvas/philip/tests/2d.text.draw.align.end.rtl.html,platform/chromium/virtual/gpu/canvas/philip/tests/2d.text.draw.align.left.html,platform/chromium/virtual/gpu/canvas/philip/tests/2d.text.draw.align.right.html,platform/chromium/virtual/gpu/canvas/philip/tests/2d.text.draw.align.start.ltr.html,platform/chromium/virtual/gpu/canvas/philip/tests/2d.text.draw.align.start.rtl.html,platform/chromium/virtual/gpu/canvas/philip/tests/2d.text.draw.baseline.alphabetic.html,platform/chromium/virtual/gpu/canvas/philip/tests/2d.text.draw.baseline.ideographic.html,platform/chromium/virtual/gpu/canvas/philip/tests/2d.text.draw.fill.maxWidth.bound.html,platform/chromium/virtual/gpu/canvas/philip/tests/2d.text.draw.fontface.html,platform/chromium/virtual/gpu/canvas/philip/tests/2d.text.draw.fontface.repeat.html,platform/chromium/virtual/gpu/canvas/philip/tests/2d.text.draw.space.basic.html,platform/chromium/virtual/gpu/canvas/philip/tests/2d.text.draw.space.collapse.nonspace.html > Roll Skia DEPS to r6641 & add suppressions > > control: https://codereview.chromium.org/11418289/ > Review URL: https://codereview.chromium.org/11412301 TBR=robertphillips@google.com Review URL: https://codereview.chromium.org/11428143 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170770 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia.gyp')
-rw-r--r--skia/skia.gyp4
1 files changed, 4 insertions, 0 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp
index ea8cf99..0decae1 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -232,6 +232,10 @@
# the few failures are a bug or not.
'SK_SUPPORT_INT_SRCRECT_DRAWBITMAPRECT',
+ # Moved from SkUserConfig.h, so we can rebaseline when we remove this.
+ 'SK_DISABLE_DITHER_32BIT_GRADIENT',
+
+ 'SK_DISABLE_DASHING_OPTIMIZATION',
'SK_DISABLE_SEPARABLE_MASK_BLUR',
],
'sources!': [