diff options
| author | Mike Reed <reed@google.com> | 2014-11-19 16:13:20 -0500 |
|---|---|---|
| committer | Tom Hudson <tomhudson@google.com> | 2015-01-06 21:41:35 +0000 |
| commit | 71487eb0ceb2b7dea02649e78d99bb5952f5eaef (patch) | |
| tree | 05513c6b4fe8ccccc1b8e08e0aae9d5094dc40f1 /libs/hwui/DamageAccumulator.cpp | |
| parent | 2b2ad7ce9f008cc383394cc91389d667575ec45d (diff) | |
Merge frameworks/base changes from master-skia to master.
Adaptations to changes in Skia upstream since Oct 2014.
(https://code.google.com/p/skia/issues/detail?id=2377)
cbb922d use new roundOut signature
77082de Call SkColorTable::readColors().
5456ab1 Handle the result of SkMatrix::asAffine.
25cfc78 Remove dependence on SK_LEGACY_PICTURE_SIZE_API.
BUG:18468293
Change-Id: I5a4d274e854298843891410b1ffd5e24f038b88a
Diffstat (limited to 'libs/hwui/DamageAccumulator.cpp')
| -rw-r--r-- | libs/hwui/DamageAccumulator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/DamageAccumulator.cpp b/libs/hwui/DamageAccumulator.cpp index a422622f6564..9bd3bdc5617e 100644 --- a/libs/hwui/DamageAccumulator.cpp +++ b/libs/hwui/DamageAccumulator.cpp @@ -222,7 +222,7 @@ void DamageAccumulator::finish(SkRect* totalDirty) { LOG_ALWAYS_FATAL_IF(mHead->prev != mHead, "Cannot finish, mismatched push/pop calls! %p vs. %p", mHead->prev, mHead); // Root node never has a transform, so this is the fully mapped dirty rect *totalDirty = mHead->pendingDirty; - totalDirty->roundOut(); + totalDirty->roundOut(totalDirty); mHead->pendingDirty.setEmpty(); } |