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

Remove obsolete SK_IGNORE_ defines

Browse Source 
In chronological order:

SK_IGNORE_THIN_STROKED_RECT_FIX   : https://codereview.chromium.org/18317003/
SK_IGNORE_64BIT_OPENGL_CHANGES    : https://codereview.chromium.org/118533003/
SK_IGNORE_FAST_RRECT_BLUR         : https://codereview.chromium.org/189663012/
SK_IGNORE_MATRIX_IMAGE_FILTER_FIX : https://skia-review.googlesource.com/c/skia/+/127125/

Bug: skia:
Change-Id: I082ee9b0636f8523476b0271677f46b274f1ce97
Reviewed-on: https://skia-review.googlesource.com/c/170721
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
This commit is contained in:
Brian Osman 2018-11-13 10:08:55 -05:00 committed by Skia Commit-Bot
parent 60b6bc3c29
commit 66af080a16
4 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/gpu/gl/GrGLTypes.h
View File

@ -46,7 +46,6 @@ typedef float GrGLclampf;
typedef double GrGLdouble;
typedef double GrGLclampd;
typedef void GrGLvoid;
#ifndef SK_IGNORE_64BIT_OPENGL_CHANGES
#ifdef _WIN64
typedef signed long long int GrGLintptr;
typedef signed long long int GrGLsizeiptr;
@ -54,10 +53,6 @@ typedef signed long long int GrGLsizeiptr;
typedef signed long int GrGLintptr;
typedef signed long int GrGLsizeiptr;
#endif
#else
typedef signed long int GrGLintptr;
typedef signed long int GrGLsizeiptr;
#endif
typedef void* GrGLeglImage;
typedef struct __GLsync* GrGLsync;

7
src/core/SkBlurMF.cpp
View File

@ -420,12 +420,7 @@ static SkCachedData* add_cached_rects(SkMask* mask, SkScalar sigma, SkBlurStyle
return cache;
}
#ifdef SK_IGNORE_FAST_RRECT_BLUR
// Use the faster analytic blur approach for ninepatch round rects
static const bool c_analyticBlurRRect{false};
#else
static const bool c_analyticBlurRRect{true};
#endif
static const bool c_analyticBlurRRect{true};
SkMaskFilterBase::FilterReturn
SkBlurMaskFilterImpl::filterRRectToNine(const SkRRect& rrect, const SkMatrix& matrix,

2
src/core/SkMatrixImageFilter.cpp
View File

@ -133,13 +133,11 @@ SkIRect SkMatrixImageFilter::onFilterNodeBounds(const SkIRect& src, const SkMatr
matrix.mapRect(&floatBounds, SkRect::Make(src));
SkIRect result = floatBounds.roundOut();
#ifndef SK_IGNORE_MATRIX_IMAGE_FILTER_FIX
if (kReverse_MapDirection == dir && kNone_SkFilterQuality != fFilterQuality) {
// When filtering we might need some pixels in the source that might be otherwise
// clipped off.
result.outset(1, 1);
}
#endif
return result;
}

12
src/gpu/ops/GrAAStrokeRectOp.cpp
View File

@ -458,7 +458,6 @@ void AAStrokeRectOp::generateAAStrokeRectGeometry(void* vertices,
SkPoint* fan3Pos = reinterpret_cast<SkPoint*>(
verts + (2 * outerVertexNum + innerVertexNum) * vertexStride);
#ifndef SK_IGNORE_THIN_STROKED_RECT_FIX
// TODO: this only really works if the X & Y margins are the same all around
// the rect (or if they are all >= 1.0).
SkScalar inset;
@ -479,17 +478,6 @@ void AAStrokeRectOp::generateAAStrokeRectGeometry(void* vertices,
inset = SK_ScalarHalf *
SkMinScalar(inset, SkTMax(devOutside.height(), devOutsideAssist.height()));
}
#else
SkScalar inset;
if (!degenerate) {
inset = SK_ScalarHalf;
} else {
// TODO use real devRect here
inset = SkMinScalar(devOutside.width(), SK_Scalar1);
inset = SK_ScalarHalf *
SkMinScalar(inset, SkTMax(devOutside.height(), devOutsideAssist.height()));
}
#endif
if (miterStroke) {
// outermost