diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-10 20:55:39 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-10 20:55:39 +0000 |
| commit | b446fc7f05d2e3f22d574187b433e02b0c781e1f (patch) | |
| tree | 9c30bf0ad928d62b8f33ed641df08668836f0a00 /src/core/SkCanvas.cpp | |
| parent | e81d1bce7e26f046b8bcdef7fcefe84eaa806a56 (diff) | |
Remove SkRasterClip::setPath(const SkPath&, const SkRasterClip&, bool).
The method is only used in SkCanvas::clipPathHelper() and only called when isRect() is true (which effectively disables the !isBW branch).
Thus, we can promote the isBW branch to the caller and drop the rest of the method.
R=reed@google.com
Author: fmalita@chromium.org
Review URL: https://chromiumcodereview.appspot.com/18552004
git-svn-id: http://skia.googlecode.com/svn/trunk@9974 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkCanvas.cpp')
| -rw-r--r-- | src/core/SkCanvas.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index 40be531d91..ae21a3535e 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -1144,7 +1144,10 @@ static bool clipPathHelper(const SkCanvas* canvas, SkRasterClip* currClip, // bounds, than just using the device. However, if currRgn is complex, // our region blitter may hork, so we do that case in two steps. if (currClip->isRect()) { - return currClip->setPath(devPath, *currClip, doAA); + // FIXME: we should also be able to do this when currClip->isBW(), + // but relaxing the test above triggers GM asserts in + // SkRgnBuilder::blitH(). We need to investigate what's going on. + return currClip->setPath(devPath, currClip->bwRgn(), doAA); } else { base.setRect(currClip->getBounds()); SkRasterClip clip; |