summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Derek Sollenberger <djsollen@google.com> 2011-08-02 10:39:43 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2011-08-02 10:39:43 -0700
commit4f7c380d5160a66274c96e1529928149ed9e9624 (patch)
tree6bf522553dfa119783cf85e09bbb2c54ca9d3a9f
parentd5a9fd5902e6c68888684bbf150f5d37620cee22 (diff)
parent09a22e33e7a912ef14982b91f9387f907cc015f5 (diff)
Merge "Reverting until we can find a better way to address this issue without affecting nine-patches with large stretchable areas."
-rw-r--r--core/jni/android/graphics/NinePatchImpl.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/core/jni/android/graphics/NinePatchImpl.cpp b/core/jni/android/graphics/NinePatchImpl.cpp
index 579749a613a3..a3e36ee9d8a1 100644
--- a/core/jni/android/graphics/NinePatchImpl.cpp
+++ b/core/jni/android/graphics/NinePatchImpl.cpp
@@ -160,14 +160,6 @@ void NinePatch_Draw(SkCanvas* canvas, const SkRect& bounds,
return;
}
- // if the nine patch is bigger than the dst on a given axis we cannot
- // stretch properly so just draw the bitmap as best as possible and return
- if (bitmap.width() >= bounds.width() || bitmap.height() >= bounds.height())
- {
- canvas->drawBitmapRect(bitmap, NULL, bounds, paint);
- return;
- }
-
// should try a quick-reject test before calling lockPixels
SkAutoLockPixels alp(bitmap);