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

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

Browse Source
This commit is contained in:
Florin Malita
2014-06-06 14:04:32 +00:00
committed by Android (Google) Code Review
parent 262d905ee7 1dc14ba388
commit 53be7b79fb
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);
}