Commit 00068b7e authored by Aaron Gable's avatar Aaron Gable Committed by Commit Bot

Revert "Bump macOS SDK to 10.12."

This reverts commit f5345de1.

Reason for revert: Breaks bots which run layout_tests
not via swarming: https://crbug.com/751421

Original change's description:
> Bump macOS SDK to 10.12.
> 
> Bug: 669240
> Change-Id: I97cf582b97fac7aec2aa92bbdda02f5c17482c1d
> Reviewed-on: https://chromium-review.googlesource.com/570459
> Reviewed-by: Erik Chen <erikchen@chromium.org>
> Reviewed-by: Nico Weber <thakis@chromium.org>
> Commit-Queue: Erik Chen <erikchen@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#491060}

TBR=thakis@chromium.org,erikchen@chromium.org

Change-Id: I3b30bd3e18fa60f736078ed889a6c574b15c6467
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 669240, 751421
Reviewed-on: https://chromium-review.googlesource.com/598449
Commit-Queue: Aaron Gable <agable@chromium.org>
Reviewed-by: default avatarAaron Gable <agable@chromium.org>
Cr-Commit-Position: refs/heads/master@{#491408}
parent 19175845
...@@ -9,7 +9,7 @@ _sdk_min_from_env = getenv("FORCE_MAC_SDK_MIN") ...@@ -9,7 +9,7 @@ _sdk_min_from_env = getenv("FORCE_MAC_SDK_MIN")
declare_args() { declare_args() {
# Minimum supported version of the Mac SDK. # Minimum supported version of the Mac SDK.
if (_sdk_min_from_env == "") { if (_sdk_min_from_env == "") {
mac_sdk_min = "10.12" mac_sdk_min = "10.10"
} else { } else {
mac_sdk_min = _sdk_min_from_env mac_sdk_min = _sdk_min_from_env
} }
...@@ -18,5 +18,5 @@ declare_args() { ...@@ -18,5 +18,5 @@ declare_args() {
# Always assert that mac_sdk_min is used on non-macOS platforms to prevent # Always assert that mac_sdk_min is used on non-macOS platforms to prevent
# unused args warnings. # unused args warnings.
if (!is_mac) { if (!is_mac) {
assert(mac_sdk_min == "10.12" || true) assert(mac_sdk_min == "10.10" || true)
} }
...@@ -115,12 +115,13 @@ namespace { ...@@ -115,12 +115,13 @@ namespace {
// an NSTableView. Future events may make cause the table view to query its // an NSTableView. Future events may make cause the table view to query its
// dataSource, which will have been deallocated. // dataSource, which will have been deallocated.
// //
// Linking against the 10.12 SDK does not "fix" this issue, since // NSTableView.dataSource becomes a zeroing weak reference starting in 10.11,
// NSTableView.dataSource is a "weak" reference, which in non-ARC land still // so this workaround can be removed once we're on the 10.11 SDK.
// translates to "raw pointer".
// //
// See https://crbug.com/653093, https://crbug.com/750242 and rdar://29409207 // See https://crbug.com/653093 and rdar://29409207 for more information.
// for more information.
#if !defined(MAC_OS_X_VERSION_10_11) || \
MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_11
void ClearTableViewDataSources(NSView* view) { void ClearTableViewDataSources(NSView* view) {
if (auto table_view = base::mac::ObjCCast<NSTableView>(view)) { if (auto table_view = base::mac::ObjCCast<NSTableView>(view)) {
...@@ -150,6 +151,12 @@ void ClearTableViewDataSourcesIfNeeded(NSWindow* leaked_window) { ...@@ -150,6 +151,12 @@ void ClearTableViewDataSourcesIfNeeded(NSWindow* leaked_window) {
base::Unretained(leaked_window))); base::Unretained(leaked_window)));
} }
#else
void ClearTableViewDataSourcesIfNeeded(NSWindow*) {}
#endif // MAC_OS_X_VERSION_10_11
} // namespace } // namespace
@implementation SSLClientCertificateSelectorCocoa @implementation SSLClientCertificateSelectorCocoa
......
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