commit ab8241880d09eb1774b4993ca6df048a27b7020c
author brianosman <brianosman@google.com> Thu Jun 16 11:41:44 2016 -0700
committer Commit bot <commit-bot@chromium.org> Thu Jun 16 11:41:44 2016 -0700
tree f3c7e4c1873771ee818e0a1c86515a3ea5250d75
parent 6a61a875467646f8dbc37cfecf49e12d1f475170

Revert of Lots of progress switching to SkColorSpace rather than SkColorProfileType (patchset #10 id:180001 of https://codereview.chromium.org/2069173002/ )

Reason for revert:
Mac crashes in GrUploadPixmapToTexture

Original issue's description:
> Lots of progress on switching to SkColorSpace rather than SkColorProfileType
>
> Fixed a bunch of code in Ganesh, as well as usage of SkColorProfileType in most of our tools (DM, SampleApp, Viewer, nanobench, skiaserve, HelloWorld).
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2069173002
>
> Committed: https://skia.googlesource.com/skia/+/6a61a875467646f8dbc37cfecf49e12d1f475170

TBR=reed@google.com,herb@google.com,msarett@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

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

example/HelloWorld.cpp

diff --git a/example/HelloWorld.cpp b/example/HelloWorld.cpp
index 32bee5d..c2dd7d8 100644
--- a/example/HelloWorld.cpp
+++ b/example/HelloWorld.cpp
@@ -155,9 +155,13 @@
         if (snap->peekPixels(&pmap)) {
             const SkImageInfo& info = pmap.info();
             fRenderTarget->writePixels(0, 0, snap->width(), snap->height(),
-                                       SkImageInfo2GrPixelConfig(info, *fContext->caps()),
-                                       pmap.addr(), pmap.rowBytes(),
-                                       GrContext::kFlushWrites_PixelOp);
+                                            SkImageInfo2GrPixelConfig(info.colorType(),
+                                                                    info.alphaType(),
+                                                                    info.profileType(),
+                                                                    *fContext->caps()),
+                                            pmap.addr(),
+                                            pmap.rowBytes(),
+                                            GrContext::kFlushWrites_PixelOp);
         }
     }
     INHERITED::present();