Commit b68e6af8 authored by Mark Mentovai's avatar Mark Mentovai Committed by Commit Bot

mac: Deal with CGColorSpaceCopyICCProfile() 10.13 SDK bug

Bug: 729896, 729895
Change-Id: I4d5ba4d5c22fc2b85aa14dcde92e02ef3454b9da
Reviewed-on: https://chromium-review.googlesource.com/541020Reviewed-by: default avatarccameron chromium <ccameron@chromium.org>
Commit-Queue: Mark Mentovai <mark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#481255}
parent 5695df5c
...@@ -4,9 +4,20 @@ ...@@ -4,9 +4,20 @@
#include "ui/gfx/icc_profile.h" #include "ui/gfx/icc_profile.h"
#include <AvailabilityMacros.h>
#include "base/mac/mac_util.h" #include "base/mac/mac_util.h"
#include "base/mac/scoped_cftyperef.h" #include "base/mac/scoped_cftyperef.h"
#if defined(MAC_OS_X_VERSION_10_13) && \
MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_13
// https://crbug.com/729896, https://openradar.appspot.com/32883726
#undef CGColorSpaceCopyICCProfile
extern "C" {
CFDataRef CGColorSpaceCopyICCProfile(CGColorSpaceRef);
} // extern "C"
#endif // MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_13
namespace gfx { namespace gfx {
// static // static
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include "ui/gfx/mac/io_surface.h" #include "ui/gfx/mac/io_surface.h"
#include <AvailabilityMacros.h>
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
...@@ -17,6 +18,15 @@ ...@@ -17,6 +18,15 @@
#include "ui/gfx/buffer_format_util.h" #include "ui/gfx/buffer_format_util.h"
#include "ui/gfx/color_space_switches.h" #include "ui/gfx/color_space_switches.h"
#if defined(MAC_OS_X_VERSION_10_13) && \
MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_13
// https://crbug.com/729896, https://openradar.appspot.com/32883726
#undef CGColorSpaceCopyICCProfile
extern "C" {
CFDataRef CGColorSpaceCopyICCProfile(CGColorSpaceRef);
} // extern "C"
#endif // MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_13
namespace gfx { namespace gfx {
namespace { namespace {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment