diff options
| author | Chris Craik <ccraik@google.com> | 2013-04-18 20:43:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-18 20:43:25 +0000 |
| commit | d3f9ffe28d1599e40f8c9a7c0c32465324bb2828 (patch) | |
| tree | a621c588f0003849c1696c35f07e3a973fc54abe /libs | |
| parent | 5d1a182a8a2dd9613ef3b1f2de7b6a3d690ae890 (diff) | |
| parent | ee5b2c6de7fb32d945a5a1303012a5f94b719dfa (diff) | |
| download | frameworks_base-d3f9ffe28d1599e40f8c9a7c0c32465324bb2828.zip frameworks_base-d3f9ffe28d1599e40f8c9a7c0c32465324bb2828.tar.gz frameworks_base-d3f9ffe28d1599e40f8c9a7c0c32465324bb2828.tar.bz2 | |
Merge "Prevent transformed ops from merging in the first place" into jb-mr2-dev
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/DisplayListOp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/hwui/DisplayListOp.h b/libs/hwui/DisplayListOp.h index ad7edb1..c277c24 100644 --- a/libs/hwui/DisplayListOp.h +++ b/libs/hwui/DisplayListOp.h @@ -237,6 +237,8 @@ public: } bool mergeAllowed() { + if (!state.mMatrix.isPureTranslate()) return false; + // checks that we're unclipped, and srcover const Rect& opBounds = state.mBounds; return fabs(opBounds.getWidth() - mLocalBounds.getWidth()) < 0.1 && |