commit b9c4978cd1bcda15b741de46c62135f2cd229696
author Brian Osman <brianosman@google.com> Fri Oct 12 12:01:22 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Oct 12 17:06:02 2018 +0000
tree b2b7b9aa73ec58ccb13ab243bbae255102233649
parent 8dc967f9e104a882f220ee571d85ff1399d5ce20

Remove dstColorSpace from SkSpecialImage::MakeFromImage

The argument is unused (and in future CLs will be removed entirely)

Bug: skia:
Change-Id: Iec6b757992f7e27d8f929b000227ec5bd3a8f8d5
Reviewed-on: https://skia-review.googlesource.com/c/161841
Commit-Queue: Mike Klein <mtklein@google.com>
Auto-Submit: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>

src/image/SkImage.cpp

diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp
index 938ce98..5b7020b 100644
--- a/src/image/SkImage.cpp
+++ b/src/image/SkImage.cpp
@@ -261,17 +261,16 @@
     if (!filter || !outSubset || !offset || !this->bounds().contains(subset)) {
         return nullptr;
     }
-    SkColorType colorType = as_IB(this)->onImageInfo().colorType();
-    SkColorSpace* colorSpace = as_IB(this)->onImageInfo().colorSpace();
     sk_sp<SkSpecialImage> srcSpecialImage = SkSpecialImage::MakeFromImage(
-        subset, sk_ref_sp(const_cast<SkImage*>(this)), colorSpace);
+        subset, sk_ref_sp(const_cast<SkImage*>(this)));
     if (!srcSpecialImage) {
         return nullptr;
     }
 
     sk_sp<SkImageFilterCache> cache(
         SkImageFilterCache::Create(SkImageFilterCache::kDefaultTransientSize));
-    SkImageFilter::OutputProperties outputProperties(colorType, colorSpace);
+    SkImageFilter::OutputProperties outputProperties(as_IB(this)->onImageInfo().colorType(),
+                                                     as_IB(this)->onImageInfo().colorSpace());
     SkImageFilter::Context context(SkMatrix::I(), clipBounds, cache.get(), outputProperties);
 
     sk_sp<SkSpecialImage> result = filter->filterImage(srcSpecialImage.get(), context, offset);