commit 996fe656340ede058a6f0e6b18f9ec525ddb4e27
author Chris Craik <ccraik@google.com> Fri Sep 20 17:13:18 2013 -0700
committer Chris Craik <ccraik@google.com> Fri Sep 20 17:25:31 2013 -0700
tree 7efca330f6633eb665b611469f1149dabb1383a5
parent 564c45b976b56bc33f18271e1c813a0bd91b2eb4

Correct bitmap merging logic

bug:10863163

This fixes two issues

The check for pure translation was incorrect. It was fixed and renamed
for clarity.

Certain matrix paths weren't setting kTypePositiveScale. For
simplicity (and because positive scale is simple to check) removed
flag in favor of dynamic checking.

Change-Id: Ic5ce235653ef49a68b8b242bd89fc2e95874ecc9

libs/hwui/Matrix.h

diff --git a/libs/hwui/Matrix.h b/libs/hwui/Matrix.h
index e2c5b20..b861ba4 100644
--- a/libs/hwui/Matrix.h
+++ b/libs/hwui/Matrix.h
@@ -64,8 +64,7 @@
         kTypeAffine = 0x4,
         kTypePerspective = 0x8,
         kTypeRectToRect = 0x10,
-        kTypePositiveScale = 0x20,
-        kTypeUnknown = 0x40,
+        kTypeUnknown = 0x20,
     };
 
     static const int sGeometryMask = 0xf;