Upstream the rest of skia diff

skia/ext/image_operations.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #define _USE_MATH_DEFINES
 #include <algorithm>
 #include <cmath>
 #include <limits>
 
 #include "skia/ext/image_operations.h"
@@ skipping 349 matching lines @@
 
 // static
 SkBitmap ImageOperations::ResizeSubpixel(const SkBitmap& source,
                                          int dest_width, int dest_height,
                                          const SkIRect& dest_subset) {
   TRACE_EVENT2("skia", "ImageOperations::ResizeSubpixel",
                "src_pixels", source.width()*source.height(),
                "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 =
       SkFontHost::GetSubpixelOrientation();
 
   // Decide on which dimension, if any, to deploy subpixel rendering.
   int w = 1;
   int h = 1;
   switch (orientation) {
     case SkFontHost::kHorizontal_LCDOrientation:
@@ skipping 77 matching lines @@
       a = a > b ? a : b;
       *dst = SkPackARGB32(a, r, g, b);
     }
     src_row += h * row_words;
     dst_row += result.rowBytes() / 4;
   }
   result.setIsOpaque(img.isOpaque());
   return result;
 #else
   return SkBitmap();
-#endif  // OS_POSIX && !OS_MACOSX
+#endif  // OS_POSIX && !OS_MACOSX && !defined(OS_ANDROID)
 }
 
 // static
 SkBitmap ImageOperations::ResizeBasic(const SkBitmap& source,
                                       ResizeMethod method,
                                       int dest_width, int dest_height,
                                       const SkIRect& dest_subset) {
   TRACE_EVENT2("skia", "ImageOperations::ResizeBasic",
                "src_pixels", source.width()*source.height(),
                "dst_pixels", dest_width*dest_height);
@@ skipping 60 matching lines @@
 
 // static
 SkBitmap ImageOperations::Resize(const SkBitmap& source,
                                  ResizeMethod method,
                                  int dest_width, int dest_height) {
   SkIRect dest_subset = { 0, 0, dest_width, dest_height };
   return Resize(source, method, dest_width, dest_height, dest_subset);
 }
 
 }  // namespace skia