From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Tue, 9 Oct 2018 10:36:20 -0700 Subject: mas_no_private_api.patch 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/content/browser/accessibility/browser_accessibility_cocoa.h b/content/browser/accessibility/browser_accessibility_cocoa.h index d38fa48b8b890d90f2911995a2a51c249005c827..5fe68c71fe101a307ef565013a91b109393457dd 100644 --- a/content/browser/accessibility/browser_accessibility_cocoa.h +++ b/content/browser/accessibility/browser_accessibility_cocoa.h @@ -109,7 +109,9 @@ struct AXTextEdit { @property(nonatomic, readonly) NSNumber* enabled; // Returns a text marker that points to the last character in the document that // can be selected with Voiceover. +#ifndef MAS_BUILD @property(nonatomic, readonly) id endTextMarker; +#endif @property(nonatomic, readonly) NSNumber* expanded; @property(nonatomic, readonly) NSNumber* focused; @property(nonatomic, readonly) NSNumber* grabbed; @@ -145,12 +147,16 @@ struct AXTextEdit { @property(nonatomic, readonly) NSArray* selectedChildren; @property(nonatomic, readonly) NSString* selectedText; @property(nonatomic, readonly) NSValue* selectedTextRange; +#ifndef MAS_BUILD @property(nonatomic, readonly) id selectedTextMarkerRange; +#endif @property(nonatomic, readonly) NSValue* size; @property(nonatomic, readonly) NSString* sortDirection; // Returns a text marker that points to the first character in the document that // can be selected with Voiceover. +#ifndef MAS_BUILD @property(nonatomic, readonly) id startTextMarker; +#endif // A string indicating the subrole of this object as far as accessibility // is concerned. @property(nonatomic, readonly) NSString* subrole; diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm index d1e716429cd96588c2df06d7c55ed6053d190f64..e1f41179b1cb3f9c68900ad0f0b0dbad6e989746 100644 --- a/content/browser/accessibility/browser_accessibility_cocoa.mm +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm @@ -135,6 +135,7 @@ // VoiceOver uses -1 to mean "no limit" for AXResultsLimit. const int kAXResultsLimitNoLimit = -1; +#ifndef MAS_BUILD extern "C" { // The following are private accessibility APIs required for cursor navigation @@ -341,6 +342,7 @@ void AddMisspelledTextAttributes( AddMisspelledTextAttributes(text_only_objects, attributed_text); return [attributed_text attributedSubstringFromRange:range]; } +#endif // Returns an autoreleased copy of the AXNodeData's attribute. NSString* NSStringForStringAttribute( @@ -595,7 +597,9 @@ + (void)initialize { {NSAccessibilityDOMIdentifierAttribute, @"domIdentifier"}, {NSAccessibilityEditableAncestorAttribute, @"editableAncestor"}, {NSAccessibilityEnabledAttribute, @"enabled"}, +#ifndef MAS_BUILD {NSAccessibilityEndTextMarkerAttribute, @"endTextMarker"}, +#endif {NSAccessibilityExpandedAttribute, @"expanded"}, {NSAccessibilityFocusableAncestorAttribute, @"focusableAncestor"}, {NSAccessibilityFocusedAttribute, @"focused"}, @@ -630,13 +634,17 @@ + (void)initialize { {NSAccessibilityRowsAttribute, @"rows"}, // TODO(aboxhall): expose // NSAccessibilityServesAsTitleForUIElementsAttribute +#ifndef MAS_BUILD {NSAccessibilityStartTextMarkerAttribute, @"startTextMarker"}, +#endif {NSAccessibilitySelectedAttribute, @"selected"}, {NSAccessibilitySelectedChildrenAttribute, @"selectedChildren"}, {NSAccessibilitySelectedTextAttribute, @"selectedText"}, {NSAccessibilitySelectedTextRangeAttribute, @"selectedTextRange"}, +#ifndef MAS_BUILD {NSAccessibilitySelectedTextMarkerRangeAttribute, @"selectedTextMarkerRange"}, +#endif {NSAccessibilitySizeAttribute, @"size"}, {NSAccessibilitySortDirectionAttribute, @"sortDirection"}, {NSAccessibilitySubroleAttribute, @"subrole"}, @@ -1052,6 +1060,7 @@ - (NSNumber*)enabled { ax::mojom::Restriction::kDisabled]; } +#ifndef MAS_BUILD // Returns a text marker that points to the last character in the document that // can be selected with VoiceOver. - (id)endTextMarker { @@ -1062,6 +1071,7 @@ - (id)endTextMarker { BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0); return CreateTextMarker(position->CreatePositionAtEndOfAnchor()); } +#endif - (NSNumber*)expanded { if (![self instanceActive]) @@ -1922,6 +1932,7 @@ - (NSValue*)selectedTextRange { return [NSValue valueWithRange:NSMakeRange(selStart, selLength)]; } +#ifndef MAS_BUILD - (id)selectedTextMarkerRange { if (![self instanceActive]) return nil; @@ -1954,6 +1965,7 @@ - (id)selectedTextMarkerRange { anchorAffinity, *focusObject, focusOffset, focusAffinity)); } +#endif - (NSValue*)size { if (![self instanceActive]) @@ -1986,6 +1998,7 @@ - (NSString*)sortDirection { return nil; } +#ifndef MAS_BUILD // Returns a text marker that points to the first character in the document that // can be selected with VoiceOver. - (id)startTextMarker { @@ -1996,6 +2009,7 @@ - (id)startTextMarker { BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0); return CreateTextMarker(position->CreatePositionAtStartOfAnchor()); } +#endif // Returns a subrole based upon the role. - (NSString*) subrole { @@ -2301,12 +2315,14 @@ - (NSAttributedString*)attributedValueForRange:(NSRange)range { NSMutableAttributedString* attributedValue = [[[NSMutableAttributedString alloc] initWithString:value] autorelease]; +#ifndef MAS_BUILD if (!owner_->IsTextOnlyObject()) { std::vector textOnlyObjects = BrowserAccessibilityManager::FindTextOnlyObjectsInRange(*owner_, *owner_); AddMisspelledTextAttributes(textOnlyObjects, attributedValue); } +#endif return [attributedValue attributedSubstringFromRange:range]; } @@ -2392,6 +2408,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute return ToBrowserAccessibilityCocoa(cell); } +#ifndef MAS_BUILD if ([attribute isEqualToString:@"AXUIElementForTextMarker"]) { BrowserAccessibilityPositionInstance position = CreatePositionFromTextMarker(parameter); @@ -2569,6 +2586,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute NSString* text = GetTextForTextMarkerRange(parameter); return [NSNumber numberWithInt:[text length]]; } +#endif if ([attribute isEqualToString: NSAccessibilityBoundsForRangeParameterizedAttribute]) { @@ -2602,6 +2620,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute return nil; } +#ifndef MAS_BUILD if ([attribute isEqualToString: NSAccessibilityLineTextMarkerRangeForTextMarkerParameterizedAttribute]) { BrowserAccessibilityPositionInstance position = @@ -2677,6 +2696,7 @@ AXPlatformRange range(position->CreatePreviousLineStartPosition( return @(child->GetIndexInParent()); } +#endif return nil; } diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm index 242a86ddd00517adc5e09310a25739ee34b3d23c..aa95e8ba159e5e185f0814d13d8743f3e5be9b67 100644 --- a/content/browser/accessibility/browser_accessibility_manager_mac.mm +++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm @@ -463,6 +463,7 @@ void PostAnnouncementNotification(NSString* announcement) { [user_info setObject:native_focus_object forKey:NSAccessibilityTextChangeElement]; +#ifndef MAS_BUILD id selected_text = [native_focus_object selectedTextMarkerRange]; if (selected_text) { NSString* const NSAccessibilitySelectedTextMarkerRangeAttribute = @@ -470,6 +471,7 @@ void PostAnnouncementNotification(NSString* announcement) { [user_info setObject:selected_text forKey:NSAccessibilitySelectedTextMarkerRangeAttribute]; } +#endif } } diff --git a/content/renderer/renderer_main_platform_delegate_mac.mm b/content/renderer/renderer_main_platform_delegate_mac.mm index b7142c2871faf4a0ba8be79266e9515d81585bdd..3d80c332e9af280a166612f6be54b6f767d729a1 100644 --- a/content/renderer/renderer_main_platform_delegate_mac.mm +++ b/content/renderer/renderer_main_platform_delegate_mac.mm @@ -23,9 +23,11 @@ #include "sandbox/mac/system_services.h" #include "services/service_manager/sandbox/mac/sandbox_mac.h" +#ifndef MAS_BUILD extern "C" { CGError CGSSetDenyWindowServerConnections(bool); }; +#endif namespace content { @@ -35,6 +37,7 @@ // verifies there are no existing open connections), and then indicates that // Chrome should continue execution without access to launchservicesd. void DisableSystemServices() { +#ifndef 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. @@ -42,6 +45,7 @@ void DisableSystemServices() { CHECK_EQ(result, kCGErrorSuccess); sandbox::DisableLaunchServices(); +#endif } // You are about to read a pretty disgusting hack. In a static initializer, diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm index 6299846975301964c4066dff1a7eec40778e8d7f..c9c64e9ea8af9c02099695db38c27871e4e19852 100644 --- a/device/bluetooth/bluetooth_adapter_mac.mm +++ b/device/bluetooth/bluetooth_adapter_mac.mm @@ -36,6 +36,7 @@ #include "device/bluetooth/bluetooth_low_energy_peripheral_manager_delegate.h" #include "device/bluetooth/bluetooth_socket_mac.h" +#ifndef MAS_BUILD extern "C" { // Undocumented IOBluetooth Preference API [1]. Used by `blueutil` [2] and // `Karabiner` [3] to programmatically control the Bluetooth state. Calling the @@ -49,6 +50,7 @@ // [4] https://support.apple.com/kb/PH25091 void IOBluetoothPreferenceSetControllerPowerState(int state); } +#endif namespace { @@ -128,8 +130,10 @@ CBCentralManagerState GetCBManagerState(CBCentralManager* manager) { controller_state_function_( base::BindRepeating(&BluetoothAdapterMac::GetHostControllerState, base::Unretained(this))), +#ifndef MAS_BUILD power_state_function_( base::BindRepeating(IOBluetoothPreferenceSetControllerPowerState)), +#endif should_update_name_(true), classic_discovery_manager_( BluetoothDiscoveryManagerMac::CreateClassic(this)), @@ -327,8 +331,12 @@ CBCentralManagerState GetCBManagerState(CBCentralManager* manager) { } bool BluetoothAdapterMac::SetPoweredImpl(bool powered) { +#ifndef MAS_BUILD power_state_function_.Run(base::strict_cast(powered)); return true; +#else + return false; +#endif } void BluetoothAdapterMac::RemovePairingDelegateInternal( diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn index 982904023e2538bbb3039e0014542248b6f589ca..f909eeb8ac8f876897dbbd233d6fd17636607974 100644 --- a/media/audio/BUILD.gn +++ b/media/audio/BUILD.gn @@ -186,6 +186,12 @@ source_set("audio") { "mac/scoped_audio_unit.cc", "mac/scoped_audio_unit.h", ] + if (is_mas_build) { + sources -= [ + "mac/coreaudio_dispatch_override.cc", + "mac/coreaudio_dispatch_override.h", + ] + } libs += [ "AudioToolbox.framework", "AudioUnit.framework", diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc index a1091960873dad8bb1b0129d20a552bf8a51739f..50bb186d1474fd4c90723ac97ac93b1d271e7a3b 100644 --- a/media/audio/mac/audio_manager_mac.cc +++ b/media/audio/mac/audio_manager_mac.cc @@ -877,7 +877,7 @@ AudioParameters AudioManagerMac::GetPreferredOutputStreamParameters( void AudioManagerMac::InitializeOnAudioThread() { DCHECK(GetTaskRunner()->BelongsToCurrentThread()); - InitializeCoreAudioDispatchOverride(); + // InitializeCoreAudioDispatchOverride(); power_observer_.reset(new AudioPowerObserver()); } diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc index 31c564faeee2c082d23e2a99753f9fee592b6212..4d032d65820ebf4f3ce4d8acb84d2354b4ab8789 100644 --- a/net/dns/dns_config_service_posix.cc +++ b/net/dns/dns_config_service_posix.cc @@ -244,6 +244,7 @@ class DnsConfigServicePosix::Watcher { bool Watch() { bool success = true; +#ifndef MAS_BUILD if (!config_watcher_.Watch(base::Bind(&Watcher::OnConfigChanged, base::Unretained(this)))) { LOG(ERROR) << "DNS config watch failed to start."; @@ -265,6 +266,7 @@ class DnsConfigServicePosix::Watcher { DNS_CONFIG_WATCH_MAX); } #endif // !defined(OS_ANDROID) && !defined(OS_IOS) +#endif return success; } diff --git a/sandbox/mac/sandbox_compiler.cc b/sandbox/mac/sandbox_compiler.cc index e524aa7b851022abed1edac39e18d8d92e5349b4..718d3f963da5c1a15a1bdb0e6043f89bc0f940f8 100644 --- a/sandbox/mac/sandbox_compiler.cc +++ b/sandbox/mac/sandbox_compiler.cc @@ -28,6 +28,7 @@ bool SandboxCompiler::InsertStringParam(const std::string& key, } bool SandboxCompiler::CompileAndApplyProfile(std::string* error) { +#ifndef MAS_BUILD char* error_internal = nullptr; std::vector params; @@ -44,6 +45,7 @@ bool SandboxCompiler::CompileAndApplyProfile(std::string* error) { sandbox::Seatbelt::FreeError(error_internal); return false; } +#endif return true; } diff --git a/sandbox/mac/seatbelt.cc b/sandbox/mac/seatbelt.cc index dfba0bded9e34be276ed111cbab44210a95b9875..876f96999f53b4666508f783a33cea245d1bc03e 100644 --- a/sandbox/mac/seatbelt.cc +++ b/sandbox/mac/seatbelt.cc @@ -64,7 +64,11 @@ void Seatbelt::FreeError(char* errorbuf) { // static bool Seatbelt::IsSandboxed() { +#ifndef 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 9073364142e8f98c8872d9b5509f92f433e06624..2356add74dfae98299a4e2b207aa26fc109f47f3 100644 --- a/sandbox/mac/seatbelt_extension.cc +++ b/sandbox/mac/seatbelt_extension.cc @@ -8,6 +8,7 @@ #include "base/memory/ptr_util.h" #include "sandbox/mac/seatbelt_extension_token.h" +#ifndef MAS_BUILD // libsandbox private API. extern "C" { extern const char* APP_SANDBOX_READ; @@ -18,6 +19,7 @@ char* sandbox_extension_issue_file(const char* type, const char* path, uint32_t flags); } +#endif namespace sandbox { @@ -46,7 +48,11 @@ std::unique_ptr SeatbeltExtension::FromToken( bool SeatbeltExtension::Consume() { DCHECK(!token_.empty()); +#ifndef MAS_BUILD handle_ = sandbox_extension_consume(token_.c_str()); +#else + handle_ = -1; +#endif return handle_ > 0; } @@ -58,7 +64,11 @@ bool SeatbeltExtension::ConsumePermanently() { } bool SeatbeltExtension::Revoke() { +#ifndef MAS_BUILD int rv = sandbox_extension_release(handle_); +#else + int rv = -1; +#endif handle_ = 0; token_.clear(); return rv == 0; @@ -76,9 +86,11 @@ SeatbeltExtension::SeatbeltExtension(const std::string& token) char* SeatbeltExtension::IssueToken(SeatbeltExtension::Type type, const std::string& resource) { switch (type) { +#ifndef MAS_BUILD case FILE_READ: return sandbox_extension_issue_file(APP_SANDBOX_READ, resource.c_str(), 0); +#endif default: NOTREACHED(); return nullptr;