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.cpp

diff --git a/libs/hwui/Matrix.cpp b/libs/hwui/Matrix.cpp
index 65e7eae..1948778 100644
--- a/libs/hwui/Matrix.cpp
+++ b/libs/hwui/Matrix.cpp
@@ -110,6 +110,10 @@
                 mType |= kTypeRectToRect;
             }
         }
+
+        if (m00 > 0.0f && m11 > 0.0f) {
+            mType |= kTypePositiveScale;
+        }
     }
     return mType;
 }
@@ -122,6 +126,10 @@
     return getType() & kTypeRectToRect;
 }
 
+bool Matrix4::positiveScale() const {
+    return getType() & kTypePositiveScale;
+}
+
 bool Matrix4::changesBounds() const {
     return getType() & (kTypeScale | kTypeAffine | kTypePerspective);
 }