AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove soft clip bool from SkCanvas

Browse Source 
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2380163002

Review-Url: https://codereview.chromium.org/2380163002
This commit is contained in:
bsalomon 2016-09-29 13:53:49 -07:00 committed by Commit bot
parent 95e8d0a4ae
commit 872b4c8cef
2 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/core/SkCanvas.h
View File

@ -535,14 +535,6 @@ public:
this->clipPath(path, kIntersect_Op, doAntiAlias);
}
/** EXPERIMENTAL -- only used for testing
Set to false to force clips to be hard, even if doAntiAlias=true is
passed to clipRect or clipPath.
*/
void setAllowSoftClip(bool allow) {
fAllowSoftClip = allow;
}
/** EXPERIMENTAL -- only used for testing
Set to simplify clip stack using path ops.
*/

11
src/core/SkCanvas.cpp
View File

@ -653,7 +653,6 @@ SkBaseDevice* SkCanvas::init(SkBaseDevice* device, InitFlags flags) {
// const-cast.
*const_cast<bool*>(&fConservativeRasterClip) = SkToBool(flags & kConservativeRasterClip_InitFlag);
fAllowSoftClip = true;
fAllowSimplifyClip = false;
fDeviceCMDirty = true;
fSaveCount = 1;
@ -1540,10 +1539,6 @@ sk_sp<SkLights> SkCanvas::getLights() const {
//////////////////////////////////////////////////////////////////////////////
void SkCanvas::clipRect(const SkRect& rect, ClipOp op, bool doAA) {
if (!fAllowSoftClip) {
doAA = false;
}
this->checkForDeferredSave();
ClipEdgeStyle edgeStyle = doAA ? kSoft_ClipEdgeStyle : kHard_ClipEdgeStyle;
this->onClipRect(rect, op, edgeStyle);
@ -1605,9 +1600,6 @@ void SkCanvas::onClipRRect(const SkRRect& rrect, ClipOp op, ClipEdgeStyle edgeSt
AutoValidateClip avc(this);
fDeviceCMDirty = true;
if (!fAllowSoftClip) {
edgeStyle = kHard_ClipEdgeStyle;
}
fClipStack->clipDevRRect(transformedRRect, op, kSoft_ClipEdgeStyle == edgeStyle);
@ -1653,9 +1645,6 @@ void SkCanvas::onClipPath(const SkPath& path, ClipOp op, ClipEdgeStyle edgeStyle
AutoValidateClip avc(this);
fDeviceCMDirty = true;
if (!fAllowSoftClip) {
edgeStyle = kHard_ClipEdgeStyle;
}
SkPath devPath;
if (fMCRec->fMatrix.isIdentity()) {