From 2907059d0eb1972a300ea1bf0cd4e4febabb9784 Mon Sep 17 00:00:00 2001 From: joshualitt Date: Wed, 25 Feb 2015 13:04:43 -0800 Subject: Revert of Pass clip to context (patchset #8 id:180001 of https://codereview.chromium.org/936943002/) Reason for revert: Strange blur problems on nexus 5 Original issue's description: > I'd really like to land this before the branch so speedy reviews are appreciated. > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/586d5d640b19860dfbbd903a5188da1bbbe87336 TBR=jvanverth@google.com,senorblanco@google.com,bsalomon@google.com,senorblanco@chromium.org,joshualitt@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/956083002 --- src/gpu/GrStencilAndCoverTextContext.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/gpu/GrStencilAndCoverTextContext.cpp') diff --git a/src/gpu/GrStencilAndCoverTextContext.cpp b/src/gpu/GrStencilAndCoverTextContext.cpp index 4b121da905..6dbfe9f2a2 100644 --- a/src/gpu/GrStencilAndCoverTextContext.cpp +++ b/src/gpu/GrStencilAndCoverTextContext.cpp @@ -65,7 +65,6 @@ bool GrStencilAndCoverTextContext::canDraw(const SkPaint& paint, const SkMatrix& } void GrStencilAndCoverTextContext::onDrawText(GrRenderTarget* rt, - const GrClip& clip, const GrPaint& paint, const SkPaint& skPaint, const SkMatrix& viewMatrix, @@ -93,7 +92,7 @@ void GrStencilAndCoverTextContext::onDrawText(GrRenderTarget* rt, // will turn off the use of device-space glyphs when perspective transforms // are in use. - this->init(rt, clip, paint, skPaint, byteLength, kMaxAccuracy_RenderMode, viewMatrix); + this->init(rt, paint, skPaint, byteLength, kMaxAccuracy_RenderMode, viewMatrix); // Transform our starting point. if (fUsingDeviceSpaceGlyphs) { @@ -156,7 +155,6 @@ void GrStencilAndCoverTextContext::onDrawText(GrRenderTarget* rt, } void GrStencilAndCoverTextContext::onDrawPosText(GrRenderTarget* rt, - const GrClip& clip, const GrPaint& paint, const SkPaint& skPaint, const SkMatrix& viewMatrix, @@ -181,7 +179,7 @@ void GrStencilAndCoverTextContext::onDrawPosText(GrRenderTarget* rt, // transform is not part of SkPaint::measureText API, and thus we use the // same glyphs as what were measured. - this->init(rt, clip, paint, skPaint, byteLength, kMaxPerformance_RenderMode, viewMatrix); + this->init(rt, paint, skPaint, byteLength, kMaxPerformance_RenderMode, viewMatrix); SkDrawCacheProc glyphCacheProc = fSkPaint.getDrawCacheProc(); @@ -234,13 +232,12 @@ static GrPathRange* get_gr_glyphs(GrContext* ctx, } void GrStencilAndCoverTextContext::init(GrRenderTarget* rt, - const GrClip& clip, const GrPaint& paint, const SkPaint& skPaint, size_t textByteLength, RenderMode renderMode, const SkMatrix& viewMatrix) { - GrTextContext::init(rt, clip, paint, skPaint); + GrTextContext::init(rt, paint, skPaint); fContextInitialMatrix = viewMatrix; fViewMatrix = viewMatrix; @@ -445,7 +442,7 @@ void GrStencilAndCoverTextContext::flush() { inverse.mapPoints(&fGlyphPositions[fFallbackGlyphsIdx], fallbackGlyphCount); } - fFallbackTextContext->drawPosText(fRenderTarget, fClip, paintFallback, skPaintFallback, + fFallbackTextContext->drawPosText(fRenderTarget, paintFallback, skPaintFallback, fViewMatrix, (char*)&fGlyphIndices[fFallbackGlyphsIdx], 2 * fallbackGlyphCount, get_xy_scalar_array(&fGlyphPositions[fFallbackGlyphsIdx]), -- cgit v1.2.3