summaryrefslogtreecommitdiffstats
path: root/base/mac/mac_util.h
diff options
context:
space:
mode:
authorrtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-04 00:34:13 +0000
committerrtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-04 00:34:13 +0000
commit4d170e8ba008550917e0a42b0e165f2e7551b7d0 (patch)
tree78d86f81e1db305a012f11dd46292a12fb1e3b4f /base/mac/mac_util.h
parent6c271d283c01f53c8e8f8ef4125781ee4896a0c2 (diff)
downloadchromium_src-4d170e8ba008550917e0a42b0e165f2e7551b7d0.zip
chromium_src-4d170e8ba008550917e0a42b0e165f2e7551b7d0.tar.gz
chromium_src-4d170e8ba008550917e0a42b0e165f2e7551b7d0.tar.bz2
Revert 170800 - Speculatively reverting 166585 to see if it fixes issue 160300 - 6% startup regression on Mac 10.6
Revert 166585 - Add a histogram enum to determine the cat's flavor and how many bits there are in it. BUG=159886, 160300 Review URL: https://codereview.chromium.org/11391002 TBR=mark@chromium.org Review URL: https://codereview.chromium.org/11348360 TBR=mark@chromium.org Review URL: https://codereview.chromium.org/11411343 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170850 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/mac/mac_util.h')
-rw-r--r--base/mac/mac_util.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/base/mac/mac_util.h b/base/mac/mac_util.h
index 1b75167..ff8b2b2 100644
--- a/base/mac/mac_util.h
+++ b/base/mac/mac_util.h
@@ -140,9 +140,8 @@ BASE_EXPORT bool IsOSMountainLionOrLater();
// This should be infrequently used. It only makes sense to use this to avoid
// codepaths that are very likely to break on future (unreleased, untested,
-// unborn) OS releases.
-BASE_EXPORT
- bool IsOSDangerouslyLaterThanMountainLionForUseByCFAllocatorReplacement();
+// unborn) OS releases, or to log when the OS is newer than any known version.
+BASE_EXPORT bool IsOSLaterThanMountainLion_DontCallThis();
// When the deployment target is set, the code produced cannot run on earlier
// OS releases. That enables some of the IsOS* family to be implemented as
@@ -173,8 +172,7 @@ inline bool IsOSMountainLionOrLater() { return true; }
MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_8
#define BASE_MAC_MAC_UTIL_H_INLINED_GT_10_8
inline bool IsOSMountainLion() { return false; }
-inline bool IsOSDangerouslyLaterThanMountainLionForUseByCFAllocatorReplacement()
-{
+inline bool IsOSLaterThanMountainLion_DontCallThis() {
return true;
}
#endif