summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
authorbulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-03 11:59:20 +0000
committerbulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-03 11:59:20 +0000
commite2b5abe9abaa29ad93523770d27215b1e3bcebdf (patch)
treefb9d752c36f65b26e7116c2b95d106f5c7d92e49 /skia
parentd4694daf6afb66b437dad5f5ca2a1468e824d7ba (diff)
downloadchromium_src-e2b5abe9abaa29ad93523770d27215b1e3bcebdf.zip
chromium_src-e2b5abe9abaa29ad93523770d27215b1e3bcebdf.tar.gz
chromium_src-e2b5abe9abaa29ad93523770d27215b1e3bcebdf.tar.bz2
Re-adds platform guard for OS_MACOSX, needed for
ImageOperations.ResizeShouldAverageColors test. BUG=84837 TEST=ImageOperations.ResizeShouldAverageColors TBR=tony@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87773 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r--skia/ext/image_operations_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/skia/ext/image_operations_unittest.cc b/skia/ext/image_operations_unittest.cc
index ecb6e23..d25752f 100644
--- a/skia/ext/image_operations_unittest.cc
+++ b/skia/ext/image_operations_unittest.cc
@@ -506,7 +506,7 @@ TEST(ImageOperations, ResizeShouldAverageColors) {
{ skia::ImageOperations::RESIZE_HAMMING1, "HAMMING1", 0.0f },
{ skia::ImageOperations::RESIZE_LANCZOS2, "LANCZOS2", 0.0f },
{ skia::ImageOperations::RESIZE_LANCZOS3, "LANCZOS3", 0.0f },
-#if defined(OS_POSIX) && !defined(GTV)
+#if defined(OS_POSIX) && !defined(GTV) && !defined(OS_MACOSX)
// SUBPIXEL has slightly worse performance than the other filters:
// 6.324 Bottom left/right corners
// 5.099 Top left/right corners