diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 23:57:33 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 23:57:33 +0000 |
| commit | 1b2b628916c556e3c8211030305070416b307394 (patch) | |
| tree | 98bfa0a7f5de3d21d3c431b4a8ac72f37e4a27ef /skia | |
| parent | eed268f96e257ebf8b598ec043b88898b579a530 (diff) | |
| download | chromium_src-1b2b628916c556e3c8211030305070416b307394.zip chromium_src-1b2b628916c556e3c8211030305070416b307394.tar.gz chromium_src-1b2b628916c556e3c8211030305070416b307394.tar.bz2 | |
[Android] Fix ImageOperations.ResizeShouldAverageColors
Add matching OS_ANDROID guard in tests missing from
http://codereview.chromium.org/10806077/
Review URL: https://chromiumcodereview.appspot.com/10827051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148665 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/ext/image_operations.cc | 2 | ||||
| -rw-r--r-- | skia/ext/image_operations_unittest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/skia/ext/image_operations.cc b/skia/ext/image_operations.cc index d92e927..b4bfc79 100644 --- a/skia/ext/image_operations.cc +++ b/skia/ext/image_operations.cc @@ -367,7 +367,7 @@ SkBitmap ImageOperations::ResizeSubpixel(const SkBitmap& source, "dst_pixels", dest_width*dest_height); // Currently only works on Linux/BSD because these are the only platforms // where SkFontHost::GetSubpixelOrder is defined. -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_LINUX) && !defined(GTV) // Understand the display. const SkFontHost::LCDOrder order = SkFontHost::GetSubpixelOrder(); const SkFontHost::LCDOrientation orientation = diff --git a/skia/ext/image_operations_unittest.cc b/skia/ext/image_operations_unittest.cc index f81363c..dc0108d 100644 --- a/skia/ext/image_operations_unittest.cc +++ b/skia/ext/image_operations_unittest.cc @@ -507,7 +507,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) && !defined(OS_MACOSX) +#if defined(OS_LINUX) && !defined(GTV) // SUBPIXEL has slightly worse performance than the other filters: // 6.324 Bottom left/right corners // 5.099 Top left/right corners |