From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Tue, 9 Oct 2018 10:36:20 -0700 Subject: mas: avoid some private APIs Guard usages in blink of private Mac APIs by MAS_BUILD, so they can be excluded for people who want to submit their apps to the Mac App store. diff --git a/base/process/process_info_mac.cc b/base/process/process_info_mac.cc index 6840358c3187522c63dff66b5a85567aaadc5c12..72c57fbc5fbb267f96ff9e21915fb801ed5bf24e 100644 --- a/base/process/process_info_mac.cc +++ b/base/process/process_info_mac.cc @@ -9,18 +9,22 @@ #include #include +#if !IS_MAS_BUILD() extern "C" { pid_t responsibility_get_pid_responsible_for_pid(pid_t) API_AVAILABLE(macosx(10.12)); } +#endif namespace base { bool IsProcessSelfResponsible() { +#if !IS_MAS_BUILD() if (__builtin_available(macOS 10.14, *)) { const pid_t pid = getpid(); return responsibility_get_pid_responsible_for_pid(pid) == pid; } +#endif return true; } diff --git a/content/renderer/renderer_main_platform_delegate_mac.mm b/content/renderer/renderer_main_platform_delegate_mac.mm index 22c7e07dffab64061d546aa537620c50948afec0..bf7f32fe6908ad5bf0186b0ad7a5e5ced88f21a5 100644 --- a/content/renderer/renderer_main_platform_delegate_mac.mm +++ b/content/renderer/renderer_main_platform_delegate_mac.mm @@ -10,9 +10,11 @@ #include "sandbox/mac/seatbelt.h" #include "sandbox/mac/system_services.h" +#if !IS_MAS_BUILD() extern "C" { CGError CGSSetDenyWindowServerConnections(bool); } +#endif #if !defined(__has_feature) || !__has_feature(objc_arc) #error "This file requires ARC support." @@ -26,6 +28,7 @@ // verifies there are no existing open connections), and then indicates that // Chrome should continue execution without access to launchservicesd. void DisableSystemServices() { +#if !IS_MAS_BUILD() // Tell the WindowServer that we don't want to make any future connections. // This will return Success as long as there are no open connections, which // is what we want. @@ -34,6 +37,7 @@ void DisableSystemServices() { sandbox::DisableLaunchServices(); sandbox::DisableCoreServicesCheckFix(); +#endif } } // namespace diff --git a/content/renderer/theme_helper_mac.mm b/content/renderer/theme_helper_mac.mm index b9788cf84caf5e151b124e4b3bea81cc906e0673..e4a884a2715be084d0d5ae8d75a3e613f181e56f 100644 --- a/content/renderer/theme_helper_mac.mm +++ b/content/renderer/theme_helper_mac.mm @@ -12,10 +12,11 @@ #error "This file requires ARC support." #endif +#if !IS_MAS_BUILD() extern "C" { bool CGFontRenderingGetFontSmoothingDisabled(void); } - +#endif namespace content { void SystemColorsDidChange(int aqua_color_variant) { @@ -34,8 +35,18 @@ void SystemColorsDidChange(int aqua_color_variant) { } bool IsSubpixelAntialiasingAvailable() { +#if !IS_MAS_BUILD() // See https://trac.webkit.org/changeset/239306/webkit for more info. return !CGFontRenderingGetFontSmoothingDisabled(); +#else + NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults]; + NSString *default_key = @"CGFontRenderingGetFontSmoothingDisabled"; + // Check that key exists since boolForKey defaults to NO when the + // key is missing and this key in fact defaults to YES; + if ([defaults objectForKey:default_key] == nil) + return false; + return ![defaults boolForKey:default_key]; +#endif } } // namespace content diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm index 79bf09102ab4ca9b0a5830132d98b7bd844b1c26..e2b20c0cda169d7b4af5c05b8797188955df8e3c 100644 --- a/device/bluetooth/bluetooth_adapter_mac.mm +++ b/device/bluetooth/bluetooth_adapter_mac.mm @@ -41,6 +41,7 @@ #error "This file requires ARC support." #endif +#if !IS_MAS_BUILD() extern "C" { // Undocumented IOBluetooth Preference API [1]. Used by `blueutil` [2] and // `Karabiner` [3] to programmatically control the Bluetooth state. Calling the @@ -54,6 +55,7 @@ // [4] https://support.apple.com/kb/PH25091 void IOBluetoothPreferenceSetControllerPowerState(int state); } +#endif namespace { @@ -97,8 +99,10 @@ bool IsDeviceSystemPaired(const std::string& device_address) { : controller_state_function_( base::BindRepeating(&BluetoothAdapterMac::GetHostControllerState, base::Unretained(this))), +#if !IS_MAS_BUILD() power_state_function_( base::BindRepeating(IOBluetoothPreferenceSetControllerPowerState)), +#endif classic_discovery_manager_( BluetoothDiscoveryManagerMac::CreateClassic(this)), device_paired_status_callback_( @@ -253,8 +257,12 @@ bool IsDeviceSystemPaired(const std::string& device_address) { } bool BluetoothAdapterMac::SetPoweredImpl(bool powered) { +#if !IS_MAS_BUILD() power_state_function_.Run(base::strict_cast(powered)); return true; +#else + return false; +#endif } base::WeakPtr diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc index 2f7b9f4fb591f92fc570a271cf7e557f0dce00f7..209d356ea8562f5af4d64c9a7699a7c4f67526e2 100644 --- a/media/audio/mac/audio_manager_mac.cc +++ b/media/audio/mac/audio_manager_mac.cc @@ -969,7 +969,7 @@ AudioParameters AudioManagerMac::GetPreferredOutputStreamParameters( void AudioManagerMac::InitializeOnAudioThread() { DCHECK(GetTaskRunner()->BelongsToCurrentThread()); - InitializeCoreAudioDispatchOverride(); + // InitializeCoreAudioDispatchOverride(); power_observer_ = std::make_unique(); } diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc index a93e7cd74d2a9d692304ecf10279fae8e96bb695..3506d6ca555701bad6623cc1c614e0081892e42b 100644 --- a/net/dns/dns_config_service_posix.cc +++ b/net/dns/dns_config_service_posix.cc @@ -130,8 +130,8 @@ class DnsConfigServicePosix::Watcher : public DnsConfigService::Watcher { bool Watch() override { CheckOnCorrectSequence(); - bool success = true; +#if !IS_MAS_BUILD() if (!config_watcher_.Watch(base::BindRepeating(&Watcher::OnConfigChanged, base::Unretained(this)))) { LOG(ERROR) << "DNS config watch failed to start."; @@ -148,6 +148,7 @@ class DnsConfigServicePosix::Watcher : public DnsConfigService::Watcher { success = false; } #endif // !BUILDFLAG(IS_IOS) +#endif return success; } diff --git a/sandbox/mac/sandbox_compiler.cc b/sandbox/mac/sandbox_compiler.cc index f35d9ef2a2df3db8ecbf1d7b909c7b1cf33f3cd9..a710b8b4f851666fd65bb37f69ec2fa70259697b 100644 --- a/sandbox/mac/sandbox_compiler.cc +++ b/sandbox/mac/sandbox_compiler.cc @@ -47,6 +47,7 @@ bool SandboxCompiler::SetParameter(const std::string& key, } bool SandboxCompiler::CompileAndApplyProfile(std::string& error) { +#if !IS_MAS_BUILD() if (mode_ == Target::kSource) { std::vector params; @@ -67,6 +68,9 @@ bool SandboxCompiler::CompileAndApplyProfile(std::string& error) { } } return false; +#else + return true; +#endif } bool SandboxCompiler::CompilePolicyToProto(mac::SandboxPolicy& policy, diff --git a/sandbox/mac/seatbelt.cc b/sandbox/mac/seatbelt.cc index 15c835e118456394c0a00ac98c11241c14ca75bd..83759e5fbc252fa57ca2fa122873dfac3d61d46d 100644 --- a/sandbox/mac/seatbelt.cc +++ b/sandbox/mac/seatbelt.cc @@ -9,7 +9,7 @@ extern "C" { #include - +#if !IS_MAS_BUILD() int sandbox_init_with_parameters(const char* profile, uint64_t flags, const char* const parameters[], @@ -40,13 +40,13 @@ sandbox_profile_t* sandbox_compile_string(const char* data, char** error); int sandbox_apply(sandbox_profile_t*); void sandbox_free_profile(sandbox_profile_t*); - +#endif } // extern "C" namespace sandbox { namespace { - +#if !IS_MAS_BUILD() bool HandleSandboxResult(int rv, char* errorbuf, std::string* error) { if (rv == 0) { if (error) @@ -74,36 +74,48 @@ bool HandleSandboxErrno(int rv, const char* message, std::string* error) { } return false; } - +#endif } // namespace // static Seatbelt::Parameters Seatbelt::Parameters::Create() { Parameters params; +#if !IS_MAS_BUILD() params.params_ = ::sandbox_create_params(); +#endif return params; } Seatbelt::Parameters::Parameters() = default; Seatbelt::Parameters::Parameters(Seatbelt::Parameters&& other) { +#if !IS_MAS_BUILD() params_ = std::exchange(other.params_, nullptr); +#endif } Seatbelt::Parameters& Seatbelt::Parameters::operator=( Seatbelt::Parameters&& other) { +#if !IS_MAS_BUILD() params_ = std::exchange(other.params_, nullptr); +#endif return *this; } bool Seatbelt::Parameters::Set(const char* key, const char* value) { +#if !IS_MAS_BUILD() return ::sandbox_set_param(params_, key, value) == 0; +#else + return true; +#endif } Seatbelt::Parameters::~Parameters() { +#if !IS_MAS_BUILD() if (params_) { ::sandbox_free_params(params_); } +#endif } // Initialize the static member variables. @@ -114,6 +126,7 @@ const char* Seatbelt::kProfilePureComputation = kSBXProfilePureComputation; // static bool Seatbelt::Init(const char* profile, uint64_t flags, std::string* error) { +#if !IS_MAS_BUILD() // OS X deprecated these functions, but did not provide a suitable replacement, // so ignore the deprecation warning. #pragma clang diagnostic push @@ -122,6 +135,9 @@ bool Seatbelt::Init(const char* profile, uint64_t flags, std::string* error) { int rv = ::sandbox_init(profile, flags, &errorbuf); return HandleSandboxResult(rv, errorbuf, error); #pragma clang diagnostic pop +#else + return true; +#endif } // static @@ -129,10 +145,14 @@ bool Seatbelt::InitWithParams(const char* profile, uint64_t flags, const char* const parameters[], std::string* error) { +#if !IS_MAS_BUILD() char* errorbuf = nullptr; int rv = ::sandbox_init_with_parameters(profile, flags, parameters, &errorbuf); return HandleSandboxResult(rv, errorbuf, error); +#else + return true; +#endif } // static @@ -140,6 +160,7 @@ bool Seatbelt::Compile(const char* profile, const Seatbelt::Parameters& params, std::string& compiled_profile, std::string* error) { +#if !IS_MAS_BUILD() char* errorbuf = nullptr; sandbox_profile_t* sandbox_profile = ::sandbox_compile_string(profile, params.params(), &errorbuf); @@ -149,33 +170,44 @@ bool Seatbelt::Compile(const char* profile, compiled_profile.assign(reinterpret_cast(sandbox_profile->data), sandbox_profile->size); ::sandbox_free_profile(sandbox_profile); +#endif return true; } // static bool Seatbelt::ApplyCompiledProfile(const std::string& profile, std::string* error) { +#if !IS_MAS_BUILD() sandbox_profile_t sbox_profile = { .builtin = nullptr, .data = reinterpret_cast(profile.data()), .size = profile.size()}; return HandleSandboxErrno(::sandbox_apply(&sbox_profile), "sandbox_apply: ", error); +#else + return true; +#endif } // static void Seatbelt::FreeError(char* errorbuf) { +#if !IS_MAS_BUILD() // OS X deprecated these functions, but did not provide a suitable replacement, // so ignore the deprecation warning. #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" return ::sandbox_free_error(errorbuf); #pragma clang diagnostic pop +#endif } // static bool Seatbelt::IsSandboxed() { +#if !IS_MAS_BUILD() return ::sandbox_check(getpid(), NULL, 0); +#else + return true; +#endif } } // namespace sandbox diff --git a/sandbox/mac/seatbelt_extension.cc b/sandbox/mac/seatbelt_extension.cc index 18479382a277cb2b25626ec8d31442bfd1377ee6..7d80d7fa8337523c3a70f317f883f0cc26c6f40b 100644 --- a/sandbox/mac/seatbelt_extension.cc +++ b/sandbox/mac/seatbelt_extension.cc @@ -11,6 +11,7 @@ #include "base/notreached.h" #include "sandbox/mac/seatbelt_extension_token.h" +#if !IS_MAS_BUILD() // libsandbox private API. extern "C" { extern const char* APP_SANDBOX_READ; @@ -22,6 +23,7 @@ char* sandbox_extension_issue_file(const char* type, const char* path, uint32_t flags); } +#endif namespace sandbox { @@ -50,7 +52,11 @@ std::unique_ptr SeatbeltExtension::FromToken( bool SeatbeltExtension::Consume() { DCHECK(!token_.empty()); +#if !IS_MAS_BUILD() handle_ = sandbox_extension_consume(token_.c_str()); +#else + handle_ = -1; +#endif return handle_ > 0; } @@ -62,7 +68,11 @@ bool SeatbeltExtension::ConsumePermanently() { } bool SeatbeltExtension::Revoke() { +#if !IS_MAS_BUILD() int rv = sandbox_extension_release(handle_); +#else + int rv = -1; +#endif handle_ = 0; token_.clear(); return rv == 0; @@ -80,12 +90,14 @@ SeatbeltExtension::SeatbeltExtension(const std::string& token) char* SeatbeltExtension::IssueToken(SeatbeltExtension::Type type, const std::string& resource) { switch (type) { +#if !IS_MAS_BUILD() case FILE_READ: return sandbox_extension_issue_file(APP_SANDBOX_READ, resource.c_str(), 0); case FILE_READ_WRITE: return sandbox_extension_issue_file(APP_SANDBOX_READ_WRITE, resource.c_str(), 0); +#endif default: NOTREACHED(); return nullptr; diff --git a/ui/accessibility/platform/inspect/ax_transform_mac.mm b/ui/accessibility/platform/inspect/ax_transform_mac.mm index fa8915da42d7c16534fd97d75f975d49b2f1cc51..45f7a83beb467f98ff15f60cec685e5fda69ddc7 100644 --- a/ui/accessibility/platform/inspect/ax_transform_mac.mm +++ b/ui/accessibility/platform/inspect/ax_transform_mac.mm @@ -112,6 +112,7 @@ } } +#if !IS_MAS_BUILD() // AXTextMarker if (IsAXTextMarker(value)) { return AXTextMarkerToBaseValue(value, indexer); @@ -121,6 +122,7 @@ if (IsAXTextMarkerRange(value)) { return AXTextMarkerRangeToBaseValue(value, indexer); } +#endif // Accessible object if (AXElementWrapper::IsValidElement(value)) {