Treat cross context images as Ganesh-created resources

Always create them budgeted, and register them with the cache (not as
wrapped resources).

Re-land (with fixes) of: https://skia-review.googlesource.com/9497

BUG=skia:

Change-Id: I2df7198adc99efa3eea99fc86b0b2930136f22c7
Reviewed-on: https://skia-review.googlesource.com/9544
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

1 files changed, 18 insertions, 1 deletions

diff --git a/tests/CrossContextImageTest.cpp b/tests/CrossContextImageTest.cpp
index e37b095c93..5c8b21e9b6 100644
--- a/tests/CrossContextImageTest.cpp
+++ b/tests/CrossContextImageTest.cpp
@@ -140,9 +140,26 @@ DEF_GPUTEST(CrossContextImage_SharedContextSameThread, reporter, /*factory*/) {
             REPORTER_ASSERT(reporter, ccid != nullptr);
 
             ContextInfo info2 = factory.getSharedContextInfo(info.grContext());
-            auto image = SkImage::MakeFromCrossContextImageData(info2.grContext(), std::move(ccid));
+            GrContext* ctx2 = info2.grContext();
+            int resourceCountBefore = 0, resourceCountAfter = 0;
+            size_t resourceBytesBefore = 0, resourceBytesAfter = 0;
+            if (ctx2 && info.grContext()->caps()->crossContextTextureSupport()) {
+                ctx2->getResourceCacheUsage(&resourceCountBefore, &resourceBytesBefore);
+            }
+
+            auto image = SkImage::MakeFromCrossContextImageData(ctx2, std::move(ccid));
             REPORTER_ASSERT(reporter, image != nullptr);
 
+            if (ctx2 && info.grContext()->caps()->crossContextTextureSupport()) {
+                // MakeFromCrossContextImageData should have imported the texture back into our
+                // cache, so we should see an uptick. (If we have crossContextTextureSupport,
+                // otherwise we're just handing around a CPU or codec-backed image, so no cache
+                // impact will occur).
+                ctx2->getResourceCacheUsage(&resourceCountAfter, &resourceBytesAfter);
+                REPORTER_ASSERT(reporter, resourceCountAfter == resourceCountBefore + 1);
+                REPORTER_ASSERT(reporter, resourceBytesAfter > resourceBytesBefore);
+            }
+
             // JPEG encode -> decode won't round trip the image perfectly
             assert_equal(reporter, testImage.get(), image.get(),
                          SkEncodedImageFormat::kJPEG == format ? 2 : 0);