commit 0e8fc8b9e6a138cf4a66b421fb824679df717329
author Brian Salomon <bsalomon@google.com> Fri Dec 09 15:10:07 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Dec 09 20:43:41 2016 +0000
tree 9db412fc2ea22314336f3680249e905c4984902c
parent 385836d3d764303cc37c4d1bcc0ab890d209374e

Relandx2 "Remove antialiasing control from GrPaint."

Fixes a bad merge.

This reverts commit 073285c0595d46205d1482cc19af2d7d891bfeae.

Change-Id: I5e92339d9b33d3a6dc58b9fcd2a1b3a5684e8f8a
Reviewed-on: https://skia-review.googlesource.com/5774
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/GrBlurUtils.h

diff --git a/src/gpu/GrBlurUtils.h b/src/gpu/GrBlurUtils.h
index 090448f..be0d2fb 100644
--- a/src/gpu/GrBlurUtils.h
+++ b/src/gpu/GrBlurUtils.h
@@ -8,11 +8,13 @@
 #ifndef GrBlurUtils_DEFINED
 #define GrBlurUtils_DEFINED
 
+#include "GrTypes.h"
+
 class GrClip;
 class GrContext;
-class GrRenderTargetContext;
 class GrPaint;
 class GrRenderTarget;
+class GrRenderTargetContext;
 class GrStyle;
 struct SkIRect;
 class SkMaskFilter;
@@ -48,6 +50,7 @@
                                 const GrClip&,
                                 const SkPath& path,
                                 GrPaint*,
+                                GrAA,
                                 const SkMatrix& viewMatrix,
                                 const SkMaskFilter*,
                                 const GrStyle&,