Don't call ColorType if not needed

Bug: 898868
Change-Id: I067bf23c3838c6a7576dc91b090f79c12ce798ea
Reviewed-on: https://chromium-review.googlesource.com/c/1351427Reviewed-by: Mohammad Reza Zakerinasab <zakerinasab@chromium.org>
Commit-Queue: Fernando Serboncini <fserb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611787}

third_party/blink/renderer/platform/graphics/decoding_image_generator.cc

@@ -175,19 +175,15 @@ bool DecodingImageGenerator::GetPixels(const SkImageInfo& dst_info,
   if (decoded && needs_color_xform) {
     TRACE_EVENT0("blink", "DecodingImageGenerator::getPixels - apply xform");
     SkPixmap src(decode_info, memory, adjusted_row_bytes);
-    decoded =
-        decoded && src.readPixels(target_info, memory, adjusted_row_bytes);
+    decoded = src.readPixels(target_info, memory, adjusted_row_bytes);
     DCHECK(decoded);
   }
 
   // Convert the color type to the requested one if necessary
-  if (target_info.colorType() != dst_info.colorType()) {
-    if (decoded) {
-      decoded = decoded &&
-                SkPixmap{target_info, memory, adjusted_row_bytes}.readPixels(
-                    SkPixmap{dst_info, pixels, row_bytes});
-      DCHECK(decoded);
-    }
+  if (decoded && target_info.colorType() != dst_info.colorType()) {
+    decoded = SkPixmap{target_info, memory, adjusted_row_bytes}.readPixels(
+        SkPixmap{dst_info, pixels, row_bytes});
+    DCHECK(decoded);
   }
   return decoded;
 }