commit 9338c6001395f6d3712175fb75d0fc5615061962
author Robert Phillips <robertphillips@google.com> Tue Feb 19 12:52:29 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Feb 19 18:24:27 2019 +0000
tree f59eedaed40e62764e83bb97860e0cfb02a521ac
parent 136f45a63641c997dfbd171bbf58b302d8c6ab3a

Switch FP creation over to GrRecordingContext

This CL does make use of a new GrRecordingContextPriv backdoor to break CL deadlocks. This occurs when this CL tries to create GrContext-dependent objects outside its scope.

Change-Id: I925030c818f00559d4c953ae07af53667b44aab9
Reviewed-on: https://skia-review.googlesource.com/c/192032
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

src/gpu/GrFPArgs.h

diff --git a/src/gpu/GrFPArgs.h b/src/gpu/GrFPArgs.h
index cbc0420..94b26e6 100644
--- a/src/gpu/GrFPArgs.h
+++ b/src/gpu/GrFPArgs.h
@@ -12,10 +12,10 @@
 #include "SkMatrix.h"
 
 class GrColorSpaceInfo;
-class GrContext;
+class GrRecordingContext;
 
 struct GrFPArgs {
-    GrFPArgs(GrContext* context,
+    GrFPArgs(GrRecordingContext* context,
              const SkMatrix* viewMatrix,
              SkFilterQuality filterQuality,
              const GrColorSpaceInfo* dstColorSpaceInfo)
@@ -30,7 +30,7 @@
     class WithPreLocalMatrix;
     class WithPostLocalMatrix;
 
-    GrContext*      fContext;
+    GrRecordingContext* fContext;
     const SkMatrix* fViewMatrix;
 
     // We track both pre and post local matrix adjustments.  For a given FP: