commit d965bc5823d878a3fd056b8a95fb4eb578ed3fe4
author Chris Craik <ccraik@google.com> Mon Sep 16 14:47:13 2013 -0700
committer Chris Craik <ccraik@google.com> Mon Sep 16 18:19:55 2013 -0700
tree 708968d03c9260b2cc3f3bcd5eea4355c3146f63
parent 0f3e1487b26a822697f70747290809081c2072cc

Disallow negative scale matrices in merged Bitmap drawing

bug:10622962

Change-Id: I55ac18ad56b53dc9e6e6ea14cd3ec4bdafa98ac3

libs/hwui/Matrix.h

diff --git a/libs/hwui/Matrix.h b/libs/hwui/Matrix.h
index 5116203..e2c5b20 100644
--- a/libs/hwui/Matrix.h
+++ b/libs/hwui/Matrix.h
@@ -64,7 +64,8 @@
         kTypeAffine = 0x4,
         kTypePerspective = 0x8,
         kTypeRectToRect = 0x10,
-        kTypeUnknown = 0x20,
+        kTypePositiveScale = 0x20,
+        kTypeUnknown = 0x40,
     };
 
     static const int sGeometryMask = 0xf;
@@ -183,6 +184,7 @@
     bool isIdentity() const;
     bool isPerspective() const;
     bool rectToRect() const;
+    bool positiveScale() const;
 
     bool changesBounds() const;