commit efb5f07a77087889ac2d3d7f4301c320f88f8161
author Brian Salomon <bsalomon@google.com> Tue Jul 28 21:06:43 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jul 30 18:33:50 2020 +0000
tree 862b575477534b148a2f4b67f373e08eaf20db1d
parent e5543012633571f0a1a162baa8a6f81655c6426b

Remove virtual SkImage_Base::getPlanes

Change-Id: I5b106455cc54dad600e64b3f1bfcd02f5099b75b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/306360
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Reviewed-by: Adlai Holler <adlai@google.com>

tools/gpu/YUVUtils.cpp

diff --git a/tools/gpu/YUVUtils.cpp b/tools/gpu/YUVUtils.cpp
index bae564d..7b84250 100644
--- a/tools/gpu/YUVUtils.cpp
+++ b/tools/gpu/YUVUtils.cpp
@@ -8,9 +8,10 @@
 #include "tools/gpu/YUVUtils.h"
 
 #include "include/core/SkData.h"
-#include "include/gpu/GrDirectContext.h"
+#include "include/gpu/GrRecordingContext.h"
 #include "src/codec/SkCodecImageGenerator.h"
 #include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrRecordingContextPriv.h"
 
 namespace sk_gpu_test {
 
@@ -23,16 +24,16 @@
     }
 }
 
-sk_sp<SkImage> LazyYUVImage::refImage(GrContext* context) {
-    if (this->ensureYUVImage(context)) {
+sk_sp<SkImage> LazyYUVImage::refImage(GrRecordingContext* rContext) {
+    if (this->ensureYUVImage(rContext)) {
         return fYUVImage;
     } else {
         return nullptr;
     }
 }
 
-const SkImage* LazyYUVImage::getImage(GrContext* context) {
-    if (this->ensureYUVImage(context)) {
+const SkImage* LazyYUVImage::getImage(GrRecordingContext* rContext) {
+    if (this->ensureYUVImage(rContext)) {
         return fYUVImage.get();
     } else {
         return nullptr;
@@ -71,17 +72,22 @@
     return true;
 }
 
-bool LazyYUVImage::ensureYUVImage(GrContext* context) {
-    if (!context) {
+bool LazyYUVImage::ensureYUVImage(GrRecordingContext* rContext) {
+    if (!rContext) {
         return false; // Cannot make a YUV image from planes
     }
-    if (context->priv().contextID() == fOwningContextID) {
-        return fYUVImage != nullptr; // Have already made a YUV image (or tried and failed)
+    if (fYUVImage && fYUVImage->isValid(rContext)) {
+        return true; // Have already made a YUV image valid for this context.
     }
-    // Must make a new YUV image
-    fYUVImage = SkImage::MakeFromYUVAPixmaps(context, fColorSpace, fPlanes, fComponents,
-            fSizeInfo.fSizes[0], kTopLeft_GrSurfaceOrigin, false, false);
-    fOwningContextID = context->priv().contextID();
+    // Try to make a new YUV image for this context.
+    fYUVImage = SkImage::MakeFromYUVAPixmaps(rContext->priv().backdoor(),
+                                             fColorSpace,
+                                             fPlanes,
+                                             fComponents,
+                                             fSizeInfo.fSizes[0],
+                                             kTopLeft_GrSurfaceOrigin,
+                                             false,
+                                             false);
     return fYUVImage != nullptr;
 }