Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(188)

Unified Diff: src/gpu/GrBlurUtils.cpp

Issue 1486923004: Retract GrRenderTarget a bit (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/GrBlurUtils.h ('k') | src/gpu/GrDrawTarget.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrBlurUtils.cpp
diff --git a/src/gpu/GrBlurUtils.cpp b/src/gpu/GrBlurUtils.cpp
index 8cd569b1b9c297c359eb433b4a4c72f46b6c3727..9ca445b5297ab7b2dbcd0d2c403294952f42c868 100644
--- a/src/gpu/GrBlurUtils.cpp
+++ b/src/gpu/GrBlurUtils.cpp
@@ -148,7 +148,6 @@ static GrTexture* create_mask_GPU(GrContext* context,
static void draw_path_with_mask_filter(GrContext* context,
GrDrawContext* drawContext,
- GrRenderTarget* renderTarget,
const GrClip& clip,
GrPaint* paint,
const SkMatrix& viewMatrix,
@@ -160,7 +159,7 @@ static void draw_path_with_mask_filter(GrContext* context,
SkASSERT(maskFilter);
SkIRect clipBounds;
- clip.getConservativeBounds(renderTarget, &clipBounds);
+ clip.getConservativeBounds(drawContext->width(), drawContext->height(), &clipBounds);
SkTLazy<SkPath> tmpPath;
GrStrokeInfo strokeInfo(origStrokeInfo);
@@ -225,7 +224,7 @@ static void draw_path_with_mask_filter(GrContext* context,
*devPathPtr,
strokeInfo,
paint->isAntiAlias(),
- renderTarget->numColorSamples()));
+ drawContext->numColorSamples()));
if (mask) {
GrTexture* filtered;
@@ -251,7 +250,6 @@ static void draw_path_with_mask_filter(GrContext* context,
void GrBlurUtils::drawPathWithMaskFilter(GrContext* context,
GrDrawContext* drawContext,
- GrRenderTarget* rt,
const GrClip& clip,
const SkPath& origPath,
GrPaint* paint,
@@ -273,13 +271,12 @@ void GrBlurUtils::drawPathWithMaskFilter(GrContext* context,
pathEffect = nullptr;
}
- draw_path_with_mask_filter(context, drawContext, rt, clip, paint, viewMatrix, mf, pathEffect,
+ draw_path_with_mask_filter(context, drawContext, clip, paint, viewMatrix, mf, pathEffect,
strokeInfo, pathPtr, pathIsMutable);
}
void GrBlurUtils::drawPathWithMaskFilter(GrContext* context,
GrDrawContext* drawContext,
- GrRenderTarget* renderTarget,
const GrClip& clip,
const SkPath& origSrcPath,
const SkPaint& paint,
@@ -340,7 +337,7 @@ void GrBlurUtils::drawPathWithMaskFilter(GrContext* context,
}
if (paint.getMaskFilter()) {
- draw_path_with_mask_filter(context, drawContext, renderTarget, clip, &grPaint, viewMatrix,
+ draw_path_with_mask_filter(context, drawContext, clip, &grPaint, viewMatrix,
paint.getMaskFilter(), pathEffect, strokeInfo,
pathPtr, pathIsMutable);
} else {
« no previous file with comments | « src/gpu/GrBlurUtils.h ('k') | src/gpu/GrDrawTarget.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698