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

Remove legacy containedInClip code

Browse Source 
It seems that we've already rebaselined the golden images

TBR: reed@google.com
Bug: skia:7271
Change-Id: I841dc4933f0cad015c3c6da7bd08ddfb2a35c5a2
Reviewed-on: https://skia-review.googlesource.com/92060
Reviewed-by: Yuqian Li <liyuqian@google.com>
Commit-Queue: Yuqian Li <liyuqian@google.com>
This commit is contained in:
Yuqian Li 2018-01-08 13:40:45 -05:00 committed by Skia Commit-Bot
parent 9e1c58cb6a
commit f484882b36
4 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/SkScan.h
View File

@ -93,11 +93,11 @@ private:
static void HairLineRgn(const SkPoint[], int count, const SkRegion*, SkBlitter*);
static void AntiHairLineRgn(const SkPoint[], int count, const SkRegion*, SkBlitter*);
static void AAAFillPath(const SkPath& path, SkBlitter* blitter, const SkIRect& pathIR,
const SkIRect& clipBounds, bool containedInClip, bool forceRLE);
const SkIRect& clipBounds, bool forceRLE);
static void DAAFillPath(const SkPath& path, SkBlitter* blitter, const SkIRect& pathIR,
const SkIRect& clipBounds, bool containedInClip, bool forceRLE);
const SkIRect& clipBounds, bool forceRLE);
static void SAAFillPath(const SkPath& path, SkBlitter* blitter, const SkIRect& pathIR,
const SkIRect& clipBounds, bool containedInClip, bool forceRLE);
const SkIRect& clipBounds, bool forceRLE);
};
/** Assign an SkXRect from a SkIRect, by promoting the src rect's coordinates

6
src/core/SkScan_AAAPath.cpp
View File

@ -1685,10 +1685,8 @@ static SK_ALWAYS_INLINE void aaa_fill_path(const SkPath& path, const SkIRect& cl
///////////////////////////////////////////////////////////////////////////////
void SkScan::AAAFillPath(const SkPath& path, SkBlitter* blitter, const SkIRect& ir,
const SkIRect& clipBounds, bool containedInClip, bool forceRLE) {
#if !defined(SK_SUPPORT_LEGACY_AA_BEHAVIOR)
containedInClip = clipBounds.contains(ir);
#endif
const SkIRect& clipBounds, bool forceRLE) {
bool containedInClip = clipBounds.contains(ir);
bool isInverse = path.isInverseFillType();
// The mask blitter (where we store intermediate alpha values directly in a mask, and then call

22
src/core/SkScan_AntiPath.cpp
View File

@ -614,11 +614,8 @@ static bool ShouldUseAAA(const SkPath& path) {
}
void SkScan::SAAFillPath(const SkPath& path, SkBlitter* blitter, const SkIRect& ir,
const SkIRect& clipBounds, bool containedInClip, bool forceRLE) {
#if !defined(SK_SUPPORT_LEGACY_AA_BEHAVIOR)
containedInClip = clipBounds.contains(ir);
#endif
const SkIRect& clipBounds, bool forceRLE) {
bool containedInClip = clipBounds.contains(ir);
bool isInverse = path.isInverseFillType();
// MaskSuperBlitter can't handle drawing outside of ir, so we can't use it
@ -750,23 +747,14 @@ void SkScan::AntiFillPath(const SkPath& path, const SkRegion& origClip,
SkASSERT(SkIntToScalar(ir.fTop) <= path.getBounds().fTop);
#ifdef SK_SUPPORT_LEGACY_CONTAINED_IN_CLIP
bool containedInClip = clipper.getClipRect() == nullptr;
#else
bool containedInClip = clipRgn->getBounds().contains(ir);
#endif
if (forceDAA || ShouldUseDAA(path)) {
SkScan::DAAFillPath(path, blitter, ir, clipRgn->getBounds(),
containedInClip, forceRLE);
SkScan::DAAFillPath(path, blitter, ir, clipRgn->getBounds(), forceRLE);
} else if (ShouldUseAAA(path)) {
// Do not use AAA if path is too complicated:
// there won't be any speedup or significant visual improvement.
SkScan::AAAFillPath(path, blitter, ir, clipRgn->getBounds(),
containedInClip, forceRLE);
SkScan::AAAFillPath(path, blitter, ir, clipRgn->getBounds(), forceRLE);
} else {
SkScan::SAAFillPath(path, blitter, ir, clipRgn->getBounds(),
containedInClip, forceRLE);
SkScan::SAAFillPath(path, blitter, ir, clipRgn->getBounds(), forceRLE);
}
if (isInverse) {

6
src/core/SkScan_DAAPath.cpp
View File

@ -319,10 +319,8 @@ void gen_alpha_deltas(const SkPath& path, const SkIRect& clipBounds, Deltas& res
// blitRegion, sk_blit_above, sk_blit_below in SkScan::AntiFillPath to maintain the draw order. If
// we do that, be caureful that blitRect may throw exception if the rect is empty.
void SkScan::DAAFillPath(const SkPath& path, SkBlitter* blitter, const SkIRect& ir,
const SkIRect& clipBounds, bool containedInClip, bool forceRLE) {
#if !defined(SK_SUPPORT_LEGACY_AA_BEHAVIOR)
containedInClip = clipBounds.contains(ir);
#endif
const SkIRect& clipBounds, bool forceRLE) {
bool containedInClip = clipBounds.contains(ir);
bool isEvenOdd = path.getFillType() & 1;
bool isConvex = path.isConvex();
bool isInverse = path.isInverseFillType();