Downgrade SkImage to GrImageContext
We still occasionally downcast, so this is not airtight,
but it (1) allows us to know where we are downcasting and
(2) lets us move away from GrContext (and hopefully remove
it sooner than later.)
All three canaries are currently broken =( so here we go!
Bug: skia:104662
Change-Id: I84efe132574690b62ea512e194e4f9e318e9c050
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/316218
Commit-Queue: Adlai Holler <adlai@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
diff --git a/tools/DDLTileHelper.cpp b/tools/DDLTileHelper.cpp
index d426b5c..8783bfd 100644
--- a/tools/DDLTileHelper.cpp
+++ b/tools/DDLTileHelper.cpp
@@ -71,13 +71,10 @@
// stored in fReconstitutedPicture's promise images are incorrect. Patch them with the correct
// one now.
for (int i = 0; i < fPromiseImages.count(); ++i) {
- // CONTEXT TODO: this can be converted to a recording context once images no longer
- // hold GrContexts
- GrContext* newContext = recordingCanvas->getGrContext();
-
if (fPromiseImages[i]->isTextureBacked()) {
+ auto rContext = recordingCanvas->recordingContext();
SkImage_GpuBase* gpuImage = (SkImage_GpuBase*) fPromiseImages[i].get();
- gpuImage->resetContext(sk_ref_sp(newContext));
+ gpuImage->resetContext(sk_ref_sp(rContext));
}
}