From 3bc266b33ad85299af06469a32ad9f6339424485 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Sat, 20 Jan 2018 22:24:41 +0000 Subject: Revert "Revert "simplify GrFPArgs, isolating localmatrix"" This reverts commit 3d628fe00a7d6cf4a375d758e7436f104d11417d. Reason for revert: not needed for roll Original change's description: > Revert "simplify GrFPArgs, isolating localmatrix" > > This reverts commit b76c71702517643b5f6081991b376bbf73b34bde. > > Reason for revert: try to unblock android roller > > Original change's description: > > simplify GrFPArgs, isolating localmatrix > > > > Bug: skia: > > Change-Id: Icee24e0a355a7d1bae29b7721b4d95db8023ca77 > > Reviewed-on: https://skia-review.googlesource.com/97063 > > Reviewed-by: Brian Salomon > > Commit-Queue: Mike Reed > > TBR=bsalomon@google.com,reed@google.com > > Change-Id: Ic7a2288844cde57922b2cc74b855eb517ade48be > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia: > Reviewed-on: https://skia-review.googlesource.com/97580 > Reviewed-by: Mike Reed > Commit-Queue: Mike Reed TBR=bsalomon@google.com,reed@google.com Change-Id: I6f7b86b5a3243d4610371654624e5606e889adef No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/97584 Reviewed-by: Mike Reed Commit-Queue: Mike Reed --- src/gpu/GrTestUtils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gpu/GrTestUtils.h') diff --git a/src/gpu/GrTestUtils.h b/src/gpu/GrTestUtils.h index 12e2ea3493..0cfe6e45a3 100644 --- a/src/gpu/GrTestUtils.h +++ b/src/gpu/GrTestUtils.h @@ -58,9 +58,9 @@ public: const GrFPArgs& args() const { return fArgs; } private: - GrFPArgs fArgs; SkMatrix fViewMatrixStorage; std::unique_ptr fColorSpaceInfoStorage; + GrFPArgs fArgs; }; // We have a simplified dash path effect here to avoid relying on SkDashPathEffect which -- cgit v1.2.3