commit 1a217eb410a0afd8f88d8beaa725fc238bcefc1c
author Brian Salomon <bsalomon@google.com> Thu Oct 24 10:50:36 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Oct 24 16:38:57 2019 +0000
tree c23cb1144c967ea0a3967d6d212573e805670295
parent 4a4400d9e9fa41776441e3909ea7505080c8cdb9

Type usage improvements in GrTextureProducer classes

Make better use of SkISize and GrImageInfo.

Change-Id: Ie3c9f16d7db05e6527baf1aae4607d74d020ee49
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/250577
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/GrImageTextureMaker.cpp

diff --git a/src/gpu/GrImageTextureMaker.cpp b/src/gpu/GrImageTextureMaker.cpp
index 13ca46da..a0b9aae 100644
--- a/src/gpu/GrImageTextureMaker.cpp
+++ b/src/gpu/GrImageTextureMaker.cpp
@@ -15,13 +15,11 @@
 
 GrImageTextureMaker::GrImageTextureMaker(GrRecordingContext* context, const SkImage* client,
                                          SkImage::CachingHint chint, bool useDecal)
-        : INHERITED(context, client->width(), client->height(), client->imageInfo().colorInfo(),
-                    useDecal)
+        : INHERITED(context, client->imageInfo(), useDecal)
         , fImage(static_cast<const SkImage_Lazy*>(client))
         , fCachingHint(chint) {
     SkASSERT(client->isLazyGenerated());
-    GrMakeKeyFromImageID(&fOriginalKey, client->uniqueID(),
-                         SkIRect::MakeWH(this->width(), this->height()));
+    GrMakeKeyFromImageID(&fOriginalKey, client->uniqueID(), SkIRect::MakeSize(this->dimensions()));
 }
 
 sk_sp<GrTextureProxy> GrImageTextureMaker::refOriginalTextureProxy(bool willBeMipped,
@@ -43,12 +41,10 @@
 
 GrYUVAImageTextureMaker::GrYUVAImageTextureMaker(GrContext* context, const SkImage* client,
                                                  bool useDecal)
-        : INHERITED(context, client->width(), client->height(), client->imageInfo().colorInfo(),
-                    useDecal)
+        : INHERITED(context, client->imageInfo(), useDecal)
         , fImage(static_cast<const SkImage_GpuYUVA*>(client)) {
     SkASSERT(as_IB(client)->isYUVA());
-    GrMakeKeyFromImageID(&fOriginalKey, client->uniqueID(),
-                         SkIRect::MakeWH(this->width(), this->height()));
+    GrMakeKeyFromImageID(&fOriginalKey, client->uniqueID(), SkIRect::MakeSize(this->dimensions()));
 }
 
 sk_sp<GrTextureProxy> GrYUVAImageTextureMaker::refOriginalTextureProxy(bool willBeMipped,