commit ff2f380fd37a9b81bb1ac247c5232f1ea5487213
author Robert Phillips <robertphillips@google.com> Mon Nov 18 16:36:54 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Nov 18 22:13:20 2019 +0000
tree b3d8a4c33041a9d22d8b069ddb8fbe21d8d5fd06
parent b1b14522dccb448b87b0674f601f912209a0e2ce

Only access the scissorState's rect when it is valid

It is odd asan/valgrind hasn't been complaining about this

Change-Id: I8e7952e6fc554450ff8c5c5940500f09be48d6b0
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/255144
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/ops/GrMeshDrawOp.cpp

diff --git a/src/gpu/ops/GrMeshDrawOp.cpp b/src/gpu/ops/GrMeshDrawOp.cpp
index 3250a22..1974fc6 100644
--- a/src/gpu/ops/GrMeshDrawOp.cpp
+++ b/src/gpu/ops/GrMeshDrawOp.cpp
@@ -100,10 +100,14 @@
 GrPipeline::FixedDynamicState* GrMeshDrawOp::Target::MakeFixedDynamicState(
         SkArenaAlloc* arena, const GrAppliedClip* clip, int numPrimProcTextures) {
 
-    if ((clip && clip->scissorState().enabled()) || numPrimProcTextures) {
-        const SkIRect& scissor = (clip) ? clip->scissorState().rect() : SkIRect::MakeEmpty();
+    bool haveScissor = clip && clip->scissorState().enabled();
 
-        auto result = arena->make<GrPipeline::FixedDynamicState>(scissor);
+    if (haveScissor || numPrimProcTextures) {
+        auto result = arena->make<GrPipeline::FixedDynamicState>();
+
+        if (haveScissor) {
+            result->fScissorRect = clip->scissorState().rect();
+        }
 
         if (numPrimProcTextures) {
             result->fPrimitiveProcessorTextures = arena->makeArrayDefault<GrTextureProxy*>(