commit d8f904f256b82e48e9a85561eb96e15399b0b2d9
author Tom Hudson <tomhudson@google.com> Wed Oct 28 20:35:36 2015 +0000
committer Tom Hudson <tomhudson@google.com> Wed Oct 28 20:35:36 2015 +0000
tree 6f418fc8ec95ab0112a39adbd7fa3bfff0d2ca4d
parent 550780745fa28ae9a87d02331841ca5ce4f9c763

Revert "Merge six commits from master-skia to master"

This reverts commit 550780745fa28ae9a87d02331841ca5ce4f9c763.

Change-Id: Ic71eccea454b26261fe6e9a9a7a24eff56396989

libs/hwui/utils/NinePatchImpl.cpp

diff --git a/libs/hwui/utils/NinePatchImpl.cpp b/libs/hwui/utils/NinePatchImpl.cpp
index 9af9911..f51f5df 100644
--- a/libs/hwui/utils/NinePatchImpl.cpp
+++ b/libs/hwui/utils/NinePatchImpl.cpp
@@ -61,7 +61,7 @@
     return SkColorSetA(c, a);
 }
 
-static void drawStretchyPatch(SkCanvas* canvas, SkIRect& isrc, const SkRect& dst,
+static void drawStretchyPatch(SkCanvas* canvas, SkIRect& src, const SkRect& dst,
                               const SkBitmap& bitmap, const SkPaint& paint,
                               SkColor initColor, uint32_t colorHint,
                               bool hasXfer) {
@@ -69,9 +69,9 @@
         ((SkPaint*)&paint)->setColor(modAlpha(colorHint, paint.getAlpha()));
         canvas->drawRect(dst, paint);
         ((SkPaint*)&paint)->setColor(initColor);
-    } else if (isrc.width() == 1 && isrc.height() == 1) {
+    } else if (src.width() == 1 && src.height() == 1) {
         SkColor c;
-        if (!getColor(bitmap, isrc.fLeft, isrc.fTop, &c)) {
+        if (!getColor(bitmap, src.fLeft, src.fTop, &c)) {
             goto SLOW_CASE;
         }
         if (0 != c || hasXfer) {
@@ -82,7 +82,7 @@
         }
     } else {
     SLOW_CASE:
-        canvas->drawBitmapRect(bitmap, SkRect::Make(isrc), dst, &paint);
+        canvas->drawBitmapRect(bitmap, &src, dst, &paint);
     }
 }