Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Unified Diff: ui/gfx/color_space_mac.mm

Issue 2119723002: Color: Add SetColorSpace member to gfx::GpuMemoryBuffer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@plumb_2
Patch Set: Add OWNERs Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/gfx/color_space_mac.mm
diff --git a/ui/gfx/color_space_mac.mm b/ui/gfx/color_space_mac.mm
index 834760601171787ce93cbc553c930539bbf166e0..630554b16e3ea7adfcb4034f98c6c7d752da4e0b 100644
--- a/ui/gfx/color_space_mac.mm
+++ b/ui/gfx/color_space_mac.mm
@@ -15,18 +15,20 @@
// static
ColorSpace ColorSpace::FromBestMonitor() {
- ColorSpace color_space;
- CGColorSpaceRef monitor_color_space(base::mac::GetSystemColorSpace());
- base::ScopedCFTypeRef<CFDataRef> icc_profile(
- CGColorSpaceCopyICCProfile(monitor_color_space));
- if (!icc_profile)
- return color_space;
- size_t length = CFDataGetLength(icc_profile);
- if (!IsValidProfileLength(length))
- return color_space;
- const unsigned char* data = CFDataGetBytePtr(icc_profile);
- color_space.icc_profile_.assign(data, data + length);
- return color_space;
+ return FromCGColorSpace(base::mac::GetSystemColorSpace());
+}
+
+// static
+ColorSpace ColorSpace::FromCGColorSpace(CGColorSpaceRef cg_color_space) {
+ base::ScopedCFTypeRef<CFDataRef> cf_icc_profile(
+ CGColorSpaceCopyICCProfile(cg_color_space));
+ if (!cf_icc_profile)
+ return gfx::ColorSpace();
+ size_t length = CFDataGetLength(cf_icc_profile);
+ const unsigned char* data = CFDataGetBytePtr(cf_icc_profile);
+ std::vector<char> vector_icc_profile;
+ vector_icc_profile.assign(data, data + length);
+ return FromICCProfile(vector_icc_profile);
}
} // namespace gfx

Powered by Google App Engine
This is Rietveld 408576698