Update TakeOwnershipOfSkImageBacking to use new MakeFromTexture API

Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel
Change-Id: Ic92a2dabc6d54dd6ce46d9542b08d4f7cf47569e
Reviewed-on: https://chromium-review.googlesource.com/964255Reviewed-by: Brian Salomon <bsalomon@chromium.org>
Reviewed-by: Eric Karl <ericrk@chromium.org>
Commit-Queue: Greg Daniel <egdaniel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543478}

cc/tiles/gpu_image_decode_cache.cc

@@ -211,12 +211,16 @@ sk_sp<SkImage> TakeOwnershipOfSkImageBacking(GrContext* context,
 
   GrSurfaceOrigin origin;
   image->getTextureHandle(false /* flushPendingGrContextIO */, &origin);
+  SkColorType color_type = image->colorType();
+  if (color_type == kUnknown_SkColorType) {
+    return nullptr;
+  }
   sk_sp<SkColorSpace> color_space = image->refColorSpace();
   GrBackendTexture backend_texture;
   SkImage::BackendTextureReleaseProc release_proc;
   SkImage::MakeBackendTextureFromSkImage(context, std::move(image),
                                          &backend_texture, &release_proc);
-  return SkImage::MakeFromTexture(context, backend_texture, origin,
+  return SkImage::MakeFromTexture(context, backend_texture, origin, color_type,
                                   kPremul_SkAlphaType, std::move(color_space));
 }