commit a3df50000fa7eac19fb92a3e95cf5a3fbb61bf23
author Chris Dalton <csmartdalton@google.com> Fri Oct 30 12:26:20 2020 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Oct 30 19:13:41 2020 +0000
tree 7f3ba2155cc2d87c45b6bfe8474dac02ddce313b
parent 869cdefdd1ae2da9b4821079498f829e0289fe1f

Fix crash in SampleCCPRGeometry

Fixes a crash introduced by 0e13db707ff3b384aaeb79cddc735967662f0ddf.

Change-Id: If250c57804705f35d11c1914efe5de2e6d5edb38
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/330936
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

samplecode/SampleCCPRGeometry.cpp

diff --git a/samplecode/SampleCCPRGeometry.cpp b/samplecode/SampleCCPRGeometry.cpp
index 7e6c394..d9938c9 100644
--- a/samplecode/SampleCCPRGeometry.cpp
+++ b/samplecode/SampleCCPRGeometry.cpp
@@ -66,7 +66,6 @@
     void updateGpuData();
 
     PrimitiveType fPrimitiveType = PrimitiveType::kCubics;
-    SkCubicType fCubicType;
 
     SkPoint fPoints[4] = {
             {100.05f, 100.05f}, {400.75f, 100.05f}, {400.75f, 300.95f}, {100.05f, 300.95f}};
@@ -187,7 +186,7 @@
     caption.appendf("PrimitiveType_%s",
                     GrCCCoverageProcessor::PrimitiveTypeName(fPrimitiveType));
     if (PrimitiveType::kCubics == fPrimitiveType) {
-        caption.appendf(" (%s)", SkCubicTypeName(fCubicType));
+        caption.appendf(" (%s)", SkCubicTypeName(SkClassifyCubic(fPoints)));
     } else if (PrimitiveType::kConics == fPrimitiveType) {
         caption.appendf(" (w=%f)", fConicWeight);
     }