commit 530c844d25340eb2f2a4500c99c3f9d04a95b66e
author msarett <msarett@google.com> Thu Jul 21 11:57:49 2016 -0700
committer Commit bot <commit-bot@chromium.org> Thu Jul 21 11:57:49 2016 -0700
tree 2d910c86ca3c49f04facead73a1085fa0dbe0f17
parent a95220d3b8deaec22a4706cd3030dd9a8454aeb9

Remove unnecessary getColorSpace() API from SkCodec

Not needed since now we can get it from the SkImageInfo.

TBR=reed@google.com
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2170793004

Review-Url: https://codereview.chromium.org/2170793004

include/codec/SkEncodedInfo.h

diff --git a/include/codec/SkEncodedInfo.h b/include/codec/SkEncodedInfo.h
index 60ad588..eb8c147 100644
--- a/include/codec/SkEncodedInfo.h
+++ b/include/codec/SkEncodedInfo.h
@@ -117,7 +117,7 @@
      * Returns an SkImageInfo with Skia color and alpha types that are the
      * closest possible match to the encoded info.
      */
-    SkImageInfo makeImageInfo(int width, int height, const sk_sp<SkColorSpace>& colorSpace) const {
+    SkImageInfo makeImageInfo(int width, int height, sk_sp<SkColorSpace> colorSpace) const {
         switch (fColor) {
             case kGray_Color:
                 SkASSERT(kOpaque_Alpha == fAlpha);
@@ -147,7 +147,7 @@
             case kYUVA_Color:
                 SkASSERT(kOpaque_Alpha != fAlpha);
                 return SkImageInfo::Make(width, height, kN32_SkColorType,
-                                         kUnpremul_SkAlphaType, colorSpace);
+                                         kUnpremul_SkAlphaType, std::move(colorSpace));
             default:
                 SkASSERT(false);
                 return SkImageInfo::MakeUnknown();