commit 061aa81252aa435a206b445d5a41f40b1e891b7f
author Chris Dalton <csmartdalton@google.com> Fri Jun 25 13:16:24 2021 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jun 25 20:38:09 2021 +0000
tree 4cebeb15397adbefefb27eb5c938d56575cf9326
parent 9d92d0ff298eedfe33c5c6b30622aa24140da16c

Handle the empty case in GrDrawingManager::insertTaskBeforeLast

Change-Id: I3c0f042b28cc39cc6df2f63b52a0f431cee6bda4
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/421826
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Adlai Holler <adlai@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

src/gpu/GrDrawingManager.cpp

diff --git a/src/gpu/GrDrawingManager.cpp b/src/gpu/GrDrawingManager.cpp
index 109aac0..46da592 100644
--- a/src/gpu/GrDrawingManager.cpp
+++ b/src/gpu/GrDrawingManager.cpp
@@ -452,10 +452,12 @@
 }
 
 GrRenderTask* GrDrawingManager::insertTaskBeforeLast(sk_sp<GrRenderTask> task) {
-    SkASSERT(!fDAG.empty());
     if (!task) {
         return nullptr;
     }
+    if (fDAG.empty()) {
+        return fDAG.push_back(std::move(task)).get();
+    }
     // Release 'fDAG.back()' and grab the raw pointer, in case the SkTArray grows
     // and reallocates during emplace_back.
     // TODO: Either use std::vector that can do this for us, or use SkSTArray to get the
@@ -662,8 +664,18 @@
         }
     }
 
-    if (!fDAG.empty() && !fDAG.back()->isClosed()) {
-        SkASSERT(fActiveOpsTask == fDAG.back().get());
+    // The active opsTask, if any, should always be at the back of the DAG.
+    if (!fDAG.empty()) {
+        if (fDAG.back()->isSetFlag(GrRenderTask::kAtlas_Flag)) {
+            SkASSERT(fActiveOpsTask == nullptr);
+            SkASSERT(!fDAG.back()->isClosed());
+        } else if (fDAG.back()->isClosed()) {
+            SkASSERT(fActiveOpsTask == nullptr);
+        } else {
+            SkASSERT(fActiveOpsTask == fDAG.back().get());
+        }
+    } else {
+        SkASSERT(fActiveOpsTask == nullptr);
     }
 }
 #endif