From be36d59e664513294c02ff9691a3c1817a712fee Mon Sep 17 00:00:00 2001
From: msarett <msarett@google.com>
Date: Mon, 13 Jun 2016 11:25:03 -0700
Subject: [PATCH] Fix SkImage::asLegacyBitmap() to respect color space info

BUG=skia:5428
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2061783002

Review-Url: https://codereview.chromium.org/2061783002
---
 gm/bitmapimage.cpp    | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/image/SkImage.cpp |  4 +--
 2 files changed, 75 insertions(+), 2 deletions(-)
 create mode 100644 gm/bitmapimage.cpp

diff --git a/gm/bitmapimage.cpp b/gm/bitmapimage.cpp
new file mode 100644
index 0000000..ad6a74d
--- /dev/null
+++ b/gm/bitmapimage.cpp
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2016 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "gm.h"
+#include "Resources.h"
+
+namespace skiagm {
+
+class BitmapImageGM : public GM {
+public:
+    BitmapImageGM() {}
+
+protected:
+
+    SkString onShortName() override {
+        return SkString("bitmap-image-srgb-linear");
+    }
+
+    SkISize onISize() override {
+        return SkISize::Make(2*kSize, 2*kSize);
+    }
+
+    void onDraw(SkCanvas* canvas) override {
+        // Create image.
+        sk_sp<SkImage> image = GetResourceAsImage("mandrill_512_q075.jpg");
+        if (!image) {
+            SkDebugf("Failure: Is the resource path set properly?");
+            return;
+        }
+
+        // Create matching bitmap.
+        SkBitmap bitmap;
+        SkAssertResult(image->asLegacyBitmap(&bitmap, SkImage::kRO_LegacyBitmapMode));
+
+        // The GM will be displayed in a 2x2 grid.
+        // The top two squares show an sRGB image, then bitmap, drawn to a linear canvas.
+        SkImageInfo linearInfo = SkImageInfo::MakeN32(2*kSize, kSize, kOpaque_SkAlphaType);
+        SkBitmap linearBMCanvas;
+        linearBMCanvas.allocPixels(linearInfo);
+        SkCanvas linearCanvas(linearBMCanvas);
+        linearCanvas.drawImage(image, 0.0f, 0.0f, nullptr);
+        linearCanvas.translate(SkScalar(kSize), 0.0f);
+        linearCanvas.drawBitmap(bitmap, 0.0f, 0.0f, nullptr);
+        canvas->drawBitmap(linearBMCanvas, 0.0f, 0.0f, nullptr);
+        canvas->translate(0.0f, SkScalar(kSize));
+
+        // The bottom two squares show an sRGB image, then bitmap, drawn to a srgb canvas.
+        SkImageInfo srgbInfo = SkImageInfo::MakeS32(2*kSize, kSize, kOpaque_SkAlphaType);
+        SkBitmap srgbBMCanvas;
+        srgbBMCanvas.allocPixels(srgbInfo);
+        SkCanvas srgbCanvas(srgbBMCanvas);
+        srgbCanvas.drawImage(image, 0.0f, 0.0f, nullptr);
+        srgbCanvas.translate(SkScalar(kSize), 0.0f);
+        srgbCanvas.drawBitmap(bitmap, 0.0f, 0.0f, nullptr);
+        canvas->drawBitmap(srgbBMCanvas, 0.0f, 0.0f, nullptr);
+    }
+
+private:
+    static constexpr int kSize = 512;
+
+    typedef GM INHERITED;
+};
+
+//////////////////////////////////////////////////////////////////////////////
+
+static GM* MyFactory(void*) { return new BitmapImageGM; }
+static GMRegistry reg(MyFactory);
+
+}
diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp
index 1c1b311..88cf779 100644
--- a/src/image/SkImage.cpp
+++ b/src/image/SkImage.cpp
@@ -319,8 +319,8 @@ bool SkImage::asLegacyBitmap(SkBitmap* bitmap, LegacyBitmapMode mode) const {
 bool SkImage_Base::onAsLegacyBitmap(SkBitmap* bitmap, LegacyBitmapMode mode) const {
     // As the base-class, all we can do is make a copy (regardless of mode).
     // Subclasses that want to be more optimal should override.
-    SkImageInfo info = SkImageInfo::MakeN32(this->width(), this->height(),
-                                    this->isOpaque() ? kOpaque_SkAlphaType : kPremul_SkAlphaType);
+    SkImageInfo info = this->onImageInfo().makeColorType(kN32_SkColorType)
+            .makeAlphaType(this->isOpaque() ? kOpaque_SkAlphaType : kPremul_SkAlphaType);
     if (!bitmap->tryAllocPixels(info)) {
         return false;
     }
-- 
2.7.4