aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/core
diff options
context:
space:
mode:
authorGravatar egdaniel <egdaniel@google.com>2016-06-17 15:11:45 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-06-17 15:11:46 -0700
commit802acec1876bb647aaab1bbcfd97748bba54da8f (patch)
tree0016427a547439bc8403ff92079c635607db869b /include/core
parent992a22d2e9f976f801c5de06c37f013293f11a82 (diff)
Revert of More removal of SkColorProfileType... (patchset #2 id:20001 of https://codereview.chromium.org/2071393002/ )
Reason for revert: This was still used in chrome Original issue's description: > More removal of SkColorProfileType... > > Scrub GMs. Remove the gDefaultProfile thing (it's unused now), along with > the command line flag that was setting it in DM and nanobench. > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2071393002 > > Committed: https://skia.googlesource.com/skia/+/944876f2745a62a839e49275daf93a0329372e67 TBR=msarett@google.com,reed@google.com,bsalomon@google.com,brianosman@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/2074103004
Diffstat (limited to 'include/core')
-rw-r--r--include/core/SkBitmap.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h
index 5406f94328..8b499097e9 100644
--- a/include/core/SkBitmap.h
+++ b/include/core/SkBitmap.h
@@ -86,6 +86,9 @@ public:
SkColorType colorType() const { return fInfo.colorType(); }
SkAlphaType alphaType() const { return fInfo.alphaType(); }
SkColorSpace* colorSpace() const { return fInfo.colorSpace(); }
+#ifdef SK_SUPPORT_LEGACY_COLORPROFILETYPE
+ SkColorProfileType profileType() const { return fInfo.profileType(); }
+#endif
/**
* Return the number of bytes per pixel based on the colortype. If the colortype is