diff options
| author | michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 19:03:14 +0000 |
|---|---|---|
| committer | michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 19:03:14 +0000 |
| commit | 4fa1077b67ab0be70dcb5185cc8b2223eaf4e321 (patch) | |
| tree | 0c130e5b6a345d8c5acf9ccfd76c3f8c09b8c295 /skia/ext/image_operations.cc | |
| parent | 425853fe26f9e3e1b7629c8722340aeb9da7f3d9 (diff) | |
| download | chromium_src-4fa1077b67ab0be70dcb5185cc8b2223eaf4e321.zip chromium_src-4fa1077b67ab0be70dcb5185cc8b2223eaf4e321.tar.gz chromium_src-4fa1077b67ab0be70dcb5185cc8b2223eaf4e321.tar.bz2 | |
Upstream the rest of skia diff
- Removed use-system-skia for android, as it didn't work now.
- Combined multiple android condition into one.
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10806077
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148156 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/ext/image_operations.cc')
| -rw-r--r-- | skia/ext/image_operations.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/skia/ext/image_operations.cc b/skia/ext/image_operations.cc index 22d262a..d92e927 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) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) // Understand the display. const SkFontHost::LCDOrder order = SkFontHost::GetSubpixelOrder(); const SkFontHost::LCDOrientation orientation = @@ -465,7 +465,7 @@ SkBitmap ImageOperations::ResizeSubpixel(const SkBitmap& source, return result; #else return SkBitmap(); -#endif // OS_POSIX && !OS_MACOSX +#endif // OS_POSIX && !OS_MACOSX && !defined(OS_ANDROID) } // static |