Merge "Remove round rect clipping optimization." into oc-dev

am: 190fe086df

Change-Id: I7b457216863872d7287e777097e04f99d2f18326
This commit is contained in:
Derek Sollenberger
2017-04-18 16:19:12 +00:00
committed by android-build-merger

View File

@@ -390,14 +390,8 @@ bool SkiaCanvas::clipRect(float left, float top, float right, float bottom, SkCl
}
bool SkiaCanvas::clipPath(const SkPath* path, SkClipOp op) {
SkRRect roundRect;
if (path->isRRect(&roundRect)) {
this->recordClip(roundRect, op);
mCanvas->clipRRect(roundRect, op);
} else {
this->recordClip(*path, op);
mCanvas->clipPath(*path, op);
}
this->recordClip(*path, op);
mCanvas->clipPath(*path, op);
return !mCanvas->isClipEmpty();
}