tree 7efca330f6633eb665b611469f1149dabb1383a5
parent 564c45b976b56bc33f18271e1c813a0bd91b2eb4
author Chris Craik <ccraik@google.com> 1379722398 -0700
committer Chris Craik <ccraik@google.com> 1379723131 -0700

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