Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement SkCanvasGlue::clipRegion() using clipPath().

Browse Source 
(Canvas clipRegion() public API is scheduled for deprecation)

The SkCanvas clip stack does not support clipRegion() ops. Implementing
these in terms of clipPath() makes persisting clips for SaveFlags
emulation purposes a whole lot simpler.

Change-Id: I41d1eb9e292ce370fba224338f9071d5e4068621
This commit is contained in:
Florin Malita
2014-06-04 19:49:13 -04:00
parent b5acfc6c4a
commit 1dc14ba388
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/jni/android/graphics/Canvas.cpp
View File

@@ -298,7 +298,16 @@ public:
jlong deviceRgnHandle, jint op) {
SkCanvas* canvas = getNativeCanvas(canvasHandle);
SkRegion* deviceRgn = reinterpret_cast<SkRegion*>(deviceRgnHandle);
canvas->clipRegion(*deviceRgn, static_cast<SkRegion::Op>(op));
SkPath rgnPath;
if (deviceRgn->getBoundaryPath(&rgnPath)) {
// The region is specified in device space.
SkMatrix savedMatrix = canvas->getTotalMatrix();
canvas->resetMatrix();
canvas->clipPath(rgnPath, static_cast<SkRegion::Op>(op));
canvas->setMatrix(savedMatrix);
} else {
canvas->clipRect(SkRect::MakeEmpty(), static_cast<SkRegion::Op>(op));
}
return hasNonEmptyClip(*canvas);
}