add a second interface to the resizer to exactly match what Chrome expects. Will make the migration much cleaner

BUG=skia:
R=mtklein@google.com

Author: humper@google.com

Review URL: https://codereview.chromium.org/353163005

2 files changed, 18 insertions, 0 deletions

diff --git a/src/core/SkBitmapScaler.cpp b/src/core/SkBitmapScaler.cpp
index 35e101efa9..aaee600c8f 100644
--- a/src/core/SkBitmapScaler.cpp
+++ b/src/core/SkBitmapScaler.cpp
@@ -317,3 +317,16 @@ bool SkBitmapScaler::Resize(SkBitmap* resultPtr,
     SkASSERT(NULL != resultPtr->getPixels());
     return true;
 }
+
+// static -- simpler interface to the resizer; returns a default bitmap if scaling
+// fails for any reason.  This is the interface that Chrome expects.
+SkBitmap SkBitmapScaler::Resize(const SkBitmap& source,
+                                ResizeMethod method,
+                                float destWidth, float destHeight,
+                                SkBitmap::Allocator* allocator) {
+  SkBitmap result;
+  if (!Resize(&result, source, method, destWidth, destHeight, allocator)) {
+    return SkBitmap();
+  }
+  return result;
+}
diff --git a/src/core/SkBitmapScaler.h b/src/core/SkBitmapScaler.h
index ef559df606..ec4c8170bc 100644
--- a/src/core/SkBitmapScaler.h
+++ b/src/core/SkBitmapScaler.h
@@ -85,6 +85,11 @@ public:
                        float dest_width, float dest_height,
                        SkBitmap::Allocator* allocator = NULL);
 
+    static SkBitmap Resize(const SkBitmap& source,
+                           ResizeMethod method,
+                           float dest_width, float dest_height,
+                           SkBitmap::Allocator* allocator = NULL);
+
      /** Platforms can also optionally overwrite the convolution functions
         if we have SIMD versions of them.
       */