aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/views
diff options
context:
space:
mode:
authorGravatar brianosman <brianosman@google.com>2016-06-16 11:41:44 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-06-16 11:41:44 -0700
commitab8241880d09eb1774b4993ca6df048a27b7020c (patch)
treef3c7e4c1873771ee818e0a1c86515a3ea5250d75 /include/views
parent6a61a875467646f8dbc37cfecf49e12d1f475170 (diff)
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
Diffstat (limited to 'include/views')
-rw-r--r--include/views/SkWindow.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/views/SkWindow.h b/include/views/SkWindow.h
index 50774849a6..341046aacc 100644
--- a/include/views/SkWindow.h
+++ b/include/views/SkWindow.h
@@ -52,7 +52,7 @@ public:
void resize(int width, int height);
void resize(const SkImageInfo&);
- void setColorType(SkColorType, sk_sp<SkColorSpace>);
+ void setColorType(SkColorType, SkColorProfileType);
bool isDirty() const { return !fDirtyRgn.isEmpty(); }
bool update(SkIRect* updateArea);