diff options
author | reed <reed@google.com> | 2014-08-07 11:48:10 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-08-07 11:48:10 -0700 |
commit | 202ab2a5cabaf25a1e6ec47c0003da3213a79864 (patch) | |
tree | 6185f039ca0462cd964dc38b35b9e71c706adffa /src/core/SkRasterClip.cpp | |
parent | 7b624480654222a72e05deb1b3cc7d1849ce043d (diff) |
add isRect() check to AAClip, to detect if a soft-clip is really just an irect
taken from (https://codereview.chromium.org/445233006/)
fix: don't assume that the first yoffset is 0, since we may have performed a translate and not
re-alloced our data.
This reverts commit 0aeea6d344f12e35e29a79f4bbc48af88f913204.
TBR=
Author: reed@google.com
Review URL: https://codereview.chromium.org/443353004
Diffstat (limited to 'src/core/SkRasterClip.cpp')
-rw-r--r-- | src/core/SkRasterClip.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/SkRasterClip.cpp b/src/core/SkRasterClip.cpp index 664211f64f..d1615a3445 100644 --- a/src/core/SkRasterClip.cpp +++ b/src/core/SkRasterClip.cpp @@ -222,7 +222,10 @@ void SkRasterClip::convertToAA() { SkASSERT(fIsBW); fAA.setRegion(fBW); fIsBW = false; - (void)this->updateCacheAndReturnNonEmpty(); + + // since we are being explicitly asked to convert-to-aa, we pass false so we don't "optimize" + // ourselves back to BW. + (void)this->updateCacheAndReturnNonEmpty(false); } #ifdef SK_DEBUG |