diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/base/ios | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-c30a6232df03e1efbd9f3b226777b07e087a1122.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/base/ios')
| -rw-r--r-- | chromium/base/ios/ios_util.h | 3 | ||||
| -rw-r--r-- | chromium/base/ios/ios_util.mm | 5 | ||||
| -rw-r--r-- | chromium/base/ios/weak_nsobject.h | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/chromium/base/ios/ios_util.h b/chromium/base/ios/ios_util.h index 0a512301abe..de44a75ad7e 100644 --- a/chromium/base/ios/ios_util.h +++ b/chromium/base/ios/ios_util.h @@ -25,6 +25,9 @@ BASE_EXPORT bool IsRunningOnIOS12OrLater(); // Returns whether the operating system is iOS 13 or later. BASE_EXPORT bool IsRunningOnIOS13OrLater(); +// Returns whether the operating system is iOS 14 or later. +BASE_EXPORT bool IsRunningOnIOS14OrLater(); + // Returns whether the operating system is at the given version or later. BASE_EXPORT bool IsRunningOnOrLater(int32_t major, int32_t minor, diff --git a/chromium/base/ios/ios_util.mm b/chromium/base/ios/ios_util.mm index a17d19b6826..553b7354331 100644 --- a/chromium/base/ios/ios_util.mm +++ b/chromium/base/ios/ios_util.mm @@ -48,6 +48,11 @@ bool IsRunningOnIOS13OrLater() { return is_running_on_or_later; } +bool IsRunningOnIOS14OrLater() { + static const bool is_running_on_or_later = IsRunningOnOrLater(14, 0, 0); + return is_running_on_or_later; +} + bool IsRunningOnOrLater(int32_t major, int32_t minor, int32_t bug_fix) { static const int32_t* current_version = OSVersionAsArray(); int32_t version[] = {major, minor, bug_fix}; diff --git a/chromium/base/ios/weak_nsobject.h b/chromium/base/ios/weak_nsobject.h index 498cdee28c5..e07c0c9b20b 100644 --- a/chromium/base/ios/weak_nsobject.h +++ b/chromium/base/ios/weak_nsobject.h @@ -8,8 +8,8 @@ #import <Foundation/Foundation.h> #import <objc/runtime.h> +#include "base/check.h" #include "base/compiler_specific.h" -#include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/threading/thread_checker.h" |