commit 777f239a65a9ab0147ef5b81cc3b4c042b3f00d5
author Brian Salomon <bsalomon@google.com> Tue Apr 21 16:38:05 2020 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Apr 21 16:38:21 2020 +0000
tree 8cc6bfd546db1051adbd76bc4db6e6f40ace4026
parent efb2133b0dd34e6d2719f83b7f9485523382cdb1

Revert "Notify RTC when OpsTask is closed so it can drop ownership"

This reverts commit 198393b2de5d9632a84773034485cf486d57d3db.

Reason for revert: android crash

Original change's description:
> Notify RTC when OpsTask is closed so it can drop ownership
> 
> Change-Id: I95d32ed89447995541f33bf80730876ce9c0747a
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/284519
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>

TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com

Change-Id: I5133fa1b8f90182864ffbee3b60bfd5781dc16bd
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/284728
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/GrOpsTask.h

diff --git a/src/gpu/GrOpsTask.h b/src/gpu/GrOpsTask.h
index bcc751d..737d541 100644
--- a/src/gpu/GrOpsTask.h
+++ b/src/gpu/GrOpsTask.h
@@ -33,13 +33,6 @@
 class GrGpuBuffer;
 class GrRenderTargetProxy;
 
-/** Observer is notified when a GrOpsTask is closed. */
-class GrOpsTaskClosedObserver {
-public:
-    virtual ~GrOpsTaskClosedObserver() = 0;
-    virtual void wasClosed(const GrOpsTask& task) = 0;
-};
-
 class GrOpsTask : public GrRenderTask {
 private:
     using DstProxyView = GrXferProcessor::DstProxyView;
@@ -52,9 +45,6 @@
 
     GrOpsTask* asOpsTask() override { return this; }
 
-    /** Each OpsTask supports a single observer at a time. */
-    void setClosedObserver(GrOpsTaskClosedObserver* observer) { fClosedObserver = observer; }
-
     bool isEmpty() const { return fOpChains.empty(); }
 
     /**
@@ -295,19 +285,18 @@
     // into the owning DDL.
     GrRecordingContext::Arenas fArenas;
     GrAuditTrail*              fAuditTrail;
-    GrOpsTaskClosedObserver*   fClosedObserver = nullptr;
 
     GrLoadOp fColorLoadOp = GrLoadOp::kLoad;
     SkPMColor4f fLoadClearColor = SK_PMColor4fTRANSPARENT;
     StencilContent fInitialStencilContent = StencilContent::kDontCare;
     bool fMustPreserveStencil = false;
 
-    uint32_t fLastClipStackGenID = SK_InvalidUniqueID;
+    uint32_t fLastClipStackGenID;
     SkIRect fLastDevClipBounds;
     int fLastClipNumAnalyticFPs;
 
     // We must track if we have a wait op so that we don't delete the op when we have a full clear.
-    bool fHasWaitOp = false;
+    bool fHasWaitOp = false;;
 
     // For ops/opsTask we have mean: 5 stdDev: 28
     SkSTArray<25, OpChain, true> fOpChains;