commit 7de73858975fc4dbccfa1c188f6d1a12d39ce2c5
author Matt Sarett <msarett@google.com> Tue Oct 25 18:36:39 2016 -0400
committer Matt Sarett <msarett@google.com> Thu Oct 27 08:22:38 2016 -0400
tree d7248884f51cfa98a7ad84f7080b2d49d5a13acd
parent d80812b8823ee62932d5da24417112c471468b8c

Implement getTransparentRegion() using SkLatticeIter

This allows us to delete utils/NinePatchImpl.cpp and
utils/NinePatch.h

Test: Passed cts tests - DrawableTest, NinePatchTest,
NinePatchDrawableTest.

Change-Id: I6b5d09fa3479e758d8b931fa0e977c25f4435a7c

libs/hwui/SkiaCanvas.cpp

diff --git a/libs/hwui/SkiaCanvas.cpp b/libs/hwui/SkiaCanvas.cpp
index 11aaebd..c48b4dc 100644
--- a/libs/hwui/SkiaCanvas.cpp
+++ b/libs/hwui/SkiaCanvas.cpp
@@ -17,6 +17,7 @@
 #include "SkiaCanvas.h"
 
 #include "CanvasProperty.h"
+#include "NinePatchUtils.h"
 #include "VectorDrawable.h"
 #include "hwui/Bitmap.h"
 #include "hwui/MinikinUtils.h"
@@ -670,23 +671,6 @@
                          indexCount, tmpPaint);
 }
 
-static inline void set_lattice_divs(SkCanvas::Lattice* lattice, const Res_png_9patch& chunk,
-                                    int width, int height) {
-    lattice->fXCount = chunk.numXDivs;
-    lattice->fYCount = chunk.numYDivs;
-    lattice->fXDivs = chunk.getXDivs();
-    lattice->fYDivs = chunk.getYDivs();
-
-    // We'll often see ninepatches where the last div is equal to the width or height.
-    // This doesn't provide any additional information and is not supported by Skia.
-    if (lattice->fXCount > 0 && width == lattice->fXDivs[lattice->fXCount - 1]) {
-        lattice->fXCount--;
-    }
-    if (lattice->fYCount > 0 && height == lattice->fYDivs[lattice->fYCount - 1]) {
-        lattice->fYCount--;
-    }
-}
-
 static inline int num_distinct_rects(const SkCanvas::Lattice& lattice) {
     int xRects;
     if (lattice.fXCount > 0) {
@@ -750,7 +734,7 @@
     hwuiBitmap.getSkBitmap(&bitmap);
 
     SkCanvas::Lattice lattice;
-    set_lattice_divs(&lattice, chunk, bitmap.width(), bitmap.height());
+    NinePatchUtils::SetLatticeDivs(&lattice, chunk, bitmap.width(), bitmap.height());
 
     lattice.fFlags = nullptr;
     int numFlags = 0;