commit 49721c84376bcb91daff84bcaa0225298866ee60
author Brian Salomon <bsalomon@google.com> Tue Nov 03 13:08:01 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Nov 03 18:52:45 2020 +0000
tree 9c7712340c7ec778cf1e089e77478096a40f1aae
parent bea4197f8bdd5597ea792d62452bb3d823fedbb8

Revert changes to unbreak bots.

f01a9d90209d824ea7449b06ad7c5e35349d6d17
is the culprit


Revert "GrRefCntedCallback has Make function."

This reverts commit b2c42140ea10d1781917023a84465386f92d2a06.

Revert "Add SkImage::MakeFromYUVATexturesCopyToExternal"

This reverts commit f01a9d90209d824ea7449b06ad7c5e35349d6d17.

Bug: skia:10632
Change-Id: Ief076f168b63ff8ca15b607163a13d5f52a733d2
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/331798
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/GrDirectContext.cpp

diff --git a/src/gpu/GrDirectContext.cpp b/src/gpu/GrDirectContext.cpp
index b6b6558..e17b569 100644
--- a/src/gpu/GrDirectContext.cpp
+++ b/src/gpu/GrDirectContext.cpp
@@ -511,7 +511,10 @@
                                                        GrProtected isProtected,
                                                        GrGpuFinishedProc finishedProc,
                                                        GrGpuFinishedContext finishedContext) {
-    auto finishedCallback = GrRefCntedCallback::Make(finishedProc, finishedContext);
+    sk_sp<GrRefCntedCallback> finishedCallback;
+    if (finishedProc) {
+        finishedCallback.reset(new GrRefCntedCallback(finishedProc, finishedContext));
+    }
 
     TRACE_EVENT0("skia.gpu", TRACE_FUNC);
     if (this->abandoned()) {
@@ -532,7 +535,10 @@
                                                        GrProtected isProtected,
                                                        GrGpuFinishedProc finishedProc,
                                                        GrGpuFinishedContext finishedContext) {
-    auto finishedCallback = GrRefCntedCallback::Make(finishedProc, finishedContext);
+    sk_sp<GrRefCntedCallback> finishedCallback;
+    if (finishedProc) {
+        finishedCallback.reset(new GrRefCntedCallback(finishedProc, finishedContext));
+    }
 
     if (this->abandoned()) {
         return {};
@@ -560,7 +566,10 @@
                                                        GrGpuFinishedContext finishedContext) {
     TRACE_EVENT0("skia.gpu", TRACE_FUNC);
 
-    auto finishedCallback = GrRefCntedCallback::Make(finishedProc, finishedContext);
+    sk_sp<GrRefCntedCallback> finishedCallback;
+    if (finishedProc) {
+        finishedCallback.reset(new GrRefCntedCallback(finishedProc, finishedContext));
+    }
 
     if (this->abandoned()) {
         return {};
@@ -597,7 +606,10 @@
                                            const SkColor4f& color,
                                            GrGpuFinishedProc finishedProc,
                                            GrGpuFinishedContext finishedContext) {
-    auto finishedCallback = GrRefCntedCallback::Make(finishedProc, finishedContext);
+    sk_sp<GrRefCntedCallback> finishedCallback;
+    if (finishedProc) {
+        finishedCallback.reset(new GrRefCntedCallback(finishedProc, finishedContext));
+    }
 
     if (this->abandoned()) {
         return false;
@@ -612,7 +624,10 @@
                                            const SkColor4f& color,
                                            GrGpuFinishedProc finishedProc,
                                            GrGpuFinishedContext finishedContext) {
-    auto finishedCallback = GrRefCntedCallback::Make(finishedProc, finishedContext);
+    sk_sp<GrRefCntedCallback> finishedCallback;
+    if (finishedProc) {
+        finishedCallback.reset(new GrRefCntedCallback(finishedProc, finishedContext));
+    }
 
     if (this->abandoned()) {
         return false;
@@ -636,7 +651,10 @@
                                            int numLevels,
                                            GrGpuFinishedProc finishedProc,
                                            GrGpuFinishedContext finishedContext) {
-    auto finishedCallback = GrRefCntedCallback::Make(finishedProc, finishedContext);
+    sk_sp<GrRefCntedCallback> finishedCallback;
+    if (finishedProc) {
+        finishedCallback.reset(new GrRefCntedCallback(finishedProc, finishedContext));
+    }
 
     if (this->abandoned()) {
         return false;
@@ -693,7 +711,10 @@
                                                              GrGpuFinishedProc finishedProc,
                                                              GrGpuFinishedContext finishedContext) {
     TRACE_EVENT0("skia.gpu", TRACE_FUNC);
-    auto finishedCallback = GrRefCntedCallback::Make(finishedProc, finishedContext);
+    sk_sp<GrRefCntedCallback> finishedCallback;
+    if (finishedProc) {
+        finishedCallback.reset(new GrRefCntedCallback(finishedProc, finishedContext));
+    }
 
     if (this->abandoned()) {
         return {};
@@ -728,7 +749,10 @@
                                                              GrGpuFinishedProc finishedProc,
                                                              GrGpuFinishedContext finishedContext) {
     TRACE_EVENT0("skia.gpu", TRACE_FUNC);
-    auto finishedCallback = GrRefCntedCallback::Make(finishedProc, finishedContext);
+    sk_sp<GrRefCntedCallback> finishedCallback;
+    if (finishedProc) {
+        finishedCallback.reset(new GrRefCntedCallback(finishedProc, finishedContext));
+    }
 
     if (this->abandoned()) {
         return {};
@@ -757,7 +781,10 @@
                                                      const SkColor4f& color,
                                                      GrGpuFinishedProc finishedProc,
                                                      GrGpuFinishedContext finishedContext) {
-    auto finishedCallback = GrRefCntedCallback::Make(finishedProc, finishedContext);
+    sk_sp<GrRefCntedCallback> finishedCallback;
+    if (finishedProc) {
+        finishedCallback.reset(new GrRefCntedCallback(finishedProc, finishedContext));
+    }
 
     if (this->abandoned()) {
         return false;
@@ -772,7 +799,10 @@
                                                      size_t dataSize,
                                                      GrGpuFinishedProc finishedProc,
                                                      GrGpuFinishedContext finishedContext) {
-    auto finishedCallback = GrRefCntedCallback::Make(finishedProc, finishedContext);
+    sk_sp<GrRefCntedCallback> finishedCallback;
+    if (finishedProc) {
+        finishedCallback.reset(new GrRefCntedCallback(finishedProc, finishedContext));
+    }
 
     if (this->abandoned()) {
         return false;
@@ -794,7 +824,10 @@
                                              GrBackendSurfaceMutableState* previousState,
                                              GrGpuFinishedProc finishedProc,
                                              GrGpuFinishedContext finishedContext) {
-    auto callback = GrRefCntedCallback::Make(finishedProc, finishedContext);
+    sk_sp<GrRefCntedCallback> callback;
+    if (finishedProc) {
+        callback.reset(new GrRefCntedCallback(finishedProc, finishedContext));
+    }
 
     if (this->abandoned()) {
         return false;
@@ -809,7 +842,10 @@
                                                   GrBackendSurfaceMutableState* previousState,
                                                   GrGpuFinishedProc finishedProc,
                                                   GrGpuFinishedContext finishedContext) {
-    auto callback = GrRefCntedCallback::Make(finishedProc, finishedContext);
+    sk_sp<GrRefCntedCallback> callback;
+    if (finishedProc) {
+        callback.reset(new GrRefCntedCallback(finishedProc, finishedContext));
+    }
 
     if (this->abandoned()) {
         return false;