fa2db00e55
* chore: bump chromium in DEPS to 93.0.4531.0 * chore: update patches * Remove IPC::Listener from WebContentsObserver https://chromium-review.googlesource.com/c/chromium/src/+/2910240 * serial: Move serial policy from profile to local state https://chromium-review.googlesource.com/c/chromium/src/+/2914194 * chore: fix pip test * chore: bump chromium in DEPS to 93.0.4532.2 * chore: update patches * Follow up ColorChooser clean ups https://chromium-review.googlesource.com/c/chromium/src/+/2928026 * Distinguish between no default printer vs. query error https://chromium-review.googlesource.com/c/chromium/src/+/2932396 * chore: remove build_do_not_include_vr_directx_helpers_when_enable_vr.patch Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
660 lines
24 KiB
Diff
660 lines
24 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Cheng Zhao <zcbenz@gmail.com>
|
|
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/content/browser/accessibility/accessibility_tree_formatter_mac.mm b/content/browser/accessibility/accessibility_tree_formatter_mac.mm
|
|
index 65adc773e82d99c5dd57d52e84a71e67d676be13..f5d0318c1c4fa036a233142cd6eea0a03eed7e39 100644
|
|
--- a/content/browser/accessibility/accessibility_tree_formatter_mac.mm
|
|
+++ b/content/browser/accessibility/accessibility_tree_formatter_mac.mm
|
|
@@ -273,7 +273,7 @@
|
|
return PopulateSize([value sizeValue]);
|
|
}
|
|
}
|
|
-
|
|
+#ifndef MAS_BUILD
|
|
// AXTextMarker
|
|
if (content::IsAXTextMarker(value)) {
|
|
return PopulateTextPosition(content::AXTextMarkerToAXPosition(value),
|
|
@@ -284,6 +284,7 @@
|
|
if (content::IsAXTextMarkerRange(value)) {
|
|
return PopulateTextMarkerRange(value, line_indexer);
|
|
}
|
|
+#endif
|
|
|
|
// AXValue
|
|
if (CFGetTypeID(value) == AXValueGetTypeID()) {
|
|
@@ -401,7 +402,7 @@
|
|
AXMakeConst(affinity));
|
|
return set;
|
|
}
|
|
-
|
|
+#ifndef MAS_BUILD
|
|
base::Value AccessibilityTreeFormatterMac::PopulateTextMarkerRange(
|
|
id marker_range,
|
|
const LineIndexer* line_indexer) const {
|
|
@@ -417,7 +418,7 @@
|
|
PopulateTextPosition(ax_range.focus()->Clone(), line_indexer));
|
|
return dict;
|
|
}
|
|
-
|
|
+#endif
|
|
base::Value AccessibilityTreeFormatterMac::PopulateArray(
|
|
NSArray* node_array,
|
|
const LineIndexer* line_indexer) const {
|
|
diff --git a/content/browser/accessibility/accessibility_tree_formatter_utils_mac.mm b/content/browser/accessibility/accessibility_tree_formatter_utils_mac.mm
|
|
index cd3f9b267edd1f1b7adcc13ee871341e3b5ec2f5..115d5e93f094c0efcda5cc5a5fe69a211de664ad 100644
|
|
--- a/content/browser/accessibility/accessibility_tree_formatter_utils_mac.mm
|
|
+++ b/content/browser/accessibility/accessibility_tree_formatter_utils_mac.mm
|
|
@@ -186,6 +186,7 @@
|
|
property_name == "AXTextMarkerRangeForUIElement") { // UIElement
|
|
return OptionalNSObject::NotNilOrError(PropertyNodeToUIElement(arg_node));
|
|
}
|
|
+#ifndef MAS_BUILD
|
|
if (property_name == "AXIndexForTextMarker" ||
|
|
property_name == "AXNextWordEndTextMarkerForTextMarker" ||
|
|
property_name ==
|
|
@@ -196,6 +197,7 @@
|
|
return OptionalNSObject::NotNilOrError(
|
|
PropertyNodeToTextMarkerRange(arg_node));
|
|
}
|
|
+#endif
|
|
|
|
return OptionalNSObject::NotApplicable();
|
|
}
|
|
@@ -261,6 +263,7 @@
|
|
return uielement;
|
|
}
|
|
|
|
+#ifndef MAS_BUILD
|
|
id AttributeInvoker::DictNodeToTextMarker(
|
|
const AXPropertyNode& dictnode) const {
|
|
if (!dictnode.IsDict()) {
|
|
@@ -368,6 +371,7 @@ OptionalNSObject TextMarkerRangeGetEndMarker(const OptionalNSObject& obj) {
|
|
return OptionalNSObject::NotNilOrError(content::AXTextMarkerFrom(
|
|
cocoa_node, range.focus()->text_offset(), range.focus()->affinity()));
|
|
}
|
|
+#endif
|
|
|
|
OptionalNSObject MakePairArray(const OptionalNSObject& obj1,
|
|
const OptionalNSObject& obj2) {
|
|
diff --git a/content/browser/accessibility/browser_accessibility_cocoa.h b/content/browser/accessibility/browser_accessibility_cocoa.h
|
|
index a7d6351854d08926c4e9c43c95e9075bd4d4c728..9c89595cb6c37527b96b4afde387133349ec5999 100644
|
|
--- a/content/browser/accessibility/browser_accessibility_cocoa.h
|
|
+++ b/content/browser/accessibility/browser_accessibility_cocoa.h
|
|
@@ -156,7 +156,9 @@ id AXTextMarkerRangeFrom(id anchor_text_marker, id focus_text_marker);
|
|
@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;
|
|
@@ -168,7 +170,9 @@ id AXTextMarkerRangeFrom(id anchor_text_marker, id focus_text_marker);
|
|
// Index of a row, column, or tree item.
|
|
@property(nonatomic, readonly) NSNumber* index;
|
|
@property(nonatomic, readonly) NSNumber* treeItemRowIndex;
|
|
+#ifndef MAS_BUILD
|
|
@property(nonatomic, readonly) NSNumber* insertionPointLineNumber;
|
|
+#endif
|
|
@property(nonatomic, readonly) NSString* invalid;
|
|
@property(nonatomic, readonly) NSNumber* isMultiSelectable;
|
|
@property(nonatomic, readonly) NSString* placeholderValue;
|
|
@@ -191,14 +195,18 @@ id AXTextMarkerRangeFrom(id anchor_text_marker, id focus_text_marker);
|
|
// The object is selected as a whole.
|
|
@property(nonatomic, readonly) NSNumber* selected;
|
|
@property(nonatomic, readonly) NSArray* selectedChildren;
|
|
+#ifndef MAS_BUILD
|
|
@property(nonatomic, readonly) NSString* selectedText;
|
|
@property(nonatomic, readonly) NSValue* selectedTextRange;
|
|
@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 30a503578611d87227e21a7d3acc1637d45ba728..41e82f5576eded04334983af2a98eba3764ca947 100644
|
|
--- a/content/browser/accessibility/browser_accessibility_cocoa.mm
|
|
+++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
|
|
@@ -205,6 +205,7 @@
|
|
NSString* const NSAccessibilityLengthForTextMarkerRangeParameterizedAttribute =
|
|
@"AXLengthForTextMarkerRange";
|
|
|
|
+#ifndef MAS_BUILD
|
|
// Private attributes that can be used for testing text markers, e.g. in dump
|
|
// tree tests.
|
|
NSString* const
|
|
@@ -216,6 +217,7 @@
|
|
NSString* const
|
|
NSAccessibilityTextMarkerNodeDebugDescriptionParameterizedAttribute =
|
|
@"AXTextMarkerNodeDebugDescription";
|
|
+#endif
|
|
|
|
// Other private attributes.
|
|
NSString* const NSAccessibilityIdentifierChromeAttribute = @"ChromeAXNodeId";
|
|
@@ -240,6 +242,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
|
|
@@ -478,6 +481,7 @@ void AddMisspelledTextAttributes(const BrowserAccessibility::AXRange& ax_range,
|
|
AddMisspelledTextAttributes(ax_range, attributed_text);
|
|
return attributed_text;
|
|
}
|
|
+#endif
|
|
|
|
// Returns an autoreleased copy of the AXNodeData's attribute.
|
|
NSString* NSStringForStringAttribute(BrowserAccessibility* browserAccessibility,
|
|
@@ -749,6 +753,7 @@ bool IsSelectedStateRelevant(BrowserAccessibility* item) {
|
|
#define NSAccessibilityLanguageAttribute @"AXLanguage"
|
|
#endif
|
|
|
|
+#ifndef MAS_BUILD
|
|
bool content::IsAXTextMarker(id object) {
|
|
if (object == nil)
|
|
return false;
|
|
@@ -792,6 +797,7 @@ bool IsSelectedStateRelevant(BrowserAccessibility* item) {
|
|
kCFAllocatorDefault, anchor_textmarker, focus_textmarker);
|
|
return [static_cast<id>(cf_marker_range) autorelease];
|
|
}
|
|
+#endif
|
|
|
|
@implementation BrowserAccessibilityCocoa
|
|
|
|
@@ -831,7 +837,9 @@ + (void)initialize {
|
|
{NSAccessibilityEditableAncestorAttribute, @"editableAncestor"},
|
|
{NSAccessibilityElementBusyAttribute, @"elementBusy"},
|
|
{NSAccessibilityEnabledAttribute, @"enabled"},
|
|
+#ifndef MAS_BUILD
|
|
{NSAccessibilityEndTextMarkerAttribute, @"endTextMarker"},
|
|
+#endif
|
|
{NSAccessibilityExpandedAttribute, @"expanded"},
|
|
{NSAccessibilityFocusableAncestorAttribute, @"focusableAncestor"},
|
|
{NSAccessibilityFocusedAttribute, @"focused"},
|
|
@@ -843,8 +851,10 @@ + (void)initialize {
|
|
{NSAccessibilityHighestEditableAncestorAttribute,
|
|
@"highestEditableAncestor"},
|
|
{NSAccessibilityIndexAttribute, @"index"},
|
|
+#ifndef MAS_BUILD
|
|
{NSAccessibilityInsertionPointLineNumberAttribute,
|
|
@"insertionPointLineNumber"},
|
|
+#endif
|
|
{NSAccessibilityInvalidAttribute, @"invalid"},
|
|
{NSAccessibilityIsMultiSelectableAttribute, @"isMultiSelectable"},
|
|
{NSAccessibilityLanguageAttribute, @"language"},
|
|
@@ -867,13 +877,17 @@ + (void)initialize {
|
|
{NSAccessibilityRowsAttribute, @"rows"},
|
|
// TODO(aboxhall): expose
|
|
// NSAccessibilityServesAsTitleForUIElementsAttribute
|
|
+#ifndef MAS_BUILD
|
|
{NSAccessibilityStartTextMarkerAttribute, @"startTextMarker"},
|
|
+#endif
|
|
{NSAccessibilitySelectedAttribute, @"selected"},
|
|
{NSAccessibilitySelectedChildrenAttribute, @"selectedChildren"},
|
|
+#ifndef MAS_BUILD
|
|
{NSAccessibilitySelectedTextAttribute, @"selectedText"},
|
|
{NSAccessibilitySelectedTextRangeAttribute, @"selectedTextRange"},
|
|
{NSAccessibilitySelectedTextMarkerRangeAttribute,
|
|
@"selectedTextMarkerRange"},
|
|
+#endif
|
|
{NSAccessibilitySizeAttribute, @"size"},
|
|
{NSAccessibilitySortDirectionAttribute, @"sortDirection"},
|
|
{NSAccessibilitySubroleAttribute, @"subrole"},
|
|
@@ -1377,6 +1391,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 {
|
|
@@ -1385,6 +1400,7 @@ - (id)endTextMarker {
|
|
BrowserAccessibility::AXPosition position = _owner->CreatePositionAt(0);
|
|
return CreateTextMarker(position->CreatePositionAtEndOfContent());
|
|
}
|
|
+#endif
|
|
|
|
- (NSNumber*)expanded {
|
|
if (![self instanceActive])
|
|
@@ -1585,6 +1601,7 @@ - (bool)findRowIndex:(BrowserAccessibilityCocoa*)toFind
|
|
return false;
|
|
}
|
|
|
|
+#ifndef MAS_BUILD
|
|
- (NSNumber*)insertionPointLineNumber {
|
|
if (![self instanceActive])
|
|
return nil;
|
|
@@ -1610,6 +1627,7 @@ - (NSNumber*)insertionPointLineNumber {
|
|
caretPosition->AsTextPosition()->text_offset());
|
|
return @(std::distance(lineBreaks.begin(), iterator));
|
|
}
|
|
+#endif
|
|
|
|
// Returns whether or not this node should be ignored in the
|
|
// accessibility tree.
|
|
@@ -1968,8 +1986,12 @@ - (BOOL)shouldExposeTitleUIElement {
|
|
return content::AXTextEdit(newValue, std::u16string(), nil);
|
|
}
|
|
}
|
|
+#ifndef MAS_BUILD
|
|
return content::AXTextEdit(insertedText, deletedText,
|
|
CreateTextMarker(_owner->CreatePositionAt(i)));
|
|
+#else
|
|
+ return content::AXTextEdit(insertedText, deletedText, nil);
|
|
+#endif
|
|
}
|
|
|
|
- (BOOL)instanceActive {
|
|
@@ -2295,6 +2317,7 @@ - (NSArray*)selectedChildren {
|
|
return ret;
|
|
}
|
|
|
|
+#ifndef MAS_BUILD
|
|
- (NSString*)selectedText {
|
|
if (![self instanceActive])
|
|
return nil;
|
|
@@ -2306,11 +2329,13 @@ - (NSString*)selectedText {
|
|
return nil;
|
|
return base::SysUTF16ToNSString(range.GetText());
|
|
}
|
|
+#endif
|
|
|
|
// Returns range of text under the current object that is selected.
|
|
//
|
|
// Example, caret at offset 5:
|
|
// NSRange: “pos=5 len=0”
|
|
+#ifndef MAS_BUILD
|
|
- (NSValue*)selectedTextRange {
|
|
if (![self instanceActive])
|
|
return nil;
|
|
@@ -2335,7 +2360,9 @@ - (NSValue*)selectedTextRange {
|
|
int selLength = range.GetText().length();
|
|
return [NSValue valueWithRange:NSMakeRange(selStart, selLength)];
|
|
}
|
|
+#endif
|
|
|
|
+#ifndef MAS_BUILD
|
|
- (id)selectedTextMarkerRange {
|
|
if (![self instanceActive])
|
|
return nil;
|
|
@@ -2347,6 +2374,7 @@ - (id)selectedTextMarkerRange {
|
|
// words correctly.
|
|
return CreateTextMarkerRange(ax_range.AsBackwardRange());
|
|
}
|
|
+#endif
|
|
|
|
- (NSValue*)size {
|
|
if (![self instanceActive])
|
|
@@ -2379,6 +2407,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 {
|
|
@@ -2387,6 +2416,7 @@ - (id)startTextMarker {
|
|
BrowserAccessibility::AXPosition position = _owner->CreatePositionAt(0);
|
|
return CreateTextMarker(position->CreatePositionAtStartOfContent());
|
|
}
|
|
+#endif
|
|
|
|
// Returns a subrole based upon the role.
|
|
- (NSString*)subrole {
|
|
@@ -2716,12 +2746,14 @@ - (NSAttributedString*)attributedValueForRange:(NSRange)range {
|
|
NSMutableAttributedString* attributedInnerText =
|
|
[[[NSMutableAttributedString alloc]
|
|
initWithString:base::SysUTF16ToNSString(innerText)] autorelease];
|
|
+#ifndef MAS_BUILD
|
|
if (!_owner->IsText()) {
|
|
BrowserAccessibility::AXRange ax_range(
|
|
_owner->CreatePositionAt(0),
|
|
_owner->CreatePositionAt(int{innerText.length()}));
|
|
AddMisspelledTextAttributes(ax_range, attributedInnerText);
|
|
}
|
|
+#endif
|
|
|
|
return [attributedInnerText attributedSubstringFromRange:range];
|
|
}
|
|
@@ -2834,6 +2866,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
|
|
return ToBrowserAccessibilityCocoa(cell);
|
|
}
|
|
|
|
+#ifndef MAS_BUILD
|
|
if ([attribute
|
|
isEqualToString:
|
|
NSAccessibilityUIElementForTextMarkerParameterizedAttribute]) {
|
|
@@ -3157,6 +3190,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
|
|
|
|
return CreateTextMarker(root->CreatePositionAt(index));
|
|
}
|
|
+#endif
|
|
|
|
if ([attribute isEqualToString:
|
|
NSAccessibilityBoundsForRangeParameterizedAttribute]) {
|
|
@@ -3187,6 +3221,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
|
|
return nil;
|
|
}
|
|
|
|
+#ifndef MAS_BUILD
|
|
if ([attribute
|
|
isEqualToString:
|
|
NSAccessibilityLineTextMarkerRangeForTextMarkerParameterizedAttribute]) {
|
|
@@ -3306,6 +3341,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
|
|
|
|
return @(child->GetIndexInParent());
|
|
}
|
|
+#endif
|
|
|
|
return nil;
|
|
}
|
|
@@ -3838,6 +3874,7 @@ - (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute {
|
|
_owner->CreatePositionAt(range.location)->AsLeafTextPosition(),
|
|
_owner->CreatePositionAt(NSMaxRange(range))->AsLeafTextPosition()));
|
|
}
|
|
+#ifndef MAS_BUILD
|
|
if ([attribute
|
|
isEqualToString:NSAccessibilitySelectedTextMarkerRangeAttribute]) {
|
|
BrowserAccessibility::AXRange range = CreateRangeFromTextMarkerRange(value);
|
|
@@ -3848,6 +3885,7 @@ - (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute {
|
|
BrowserAccessibility::AXRange(range.anchor()->AsLeafTextPosition(),
|
|
range.focus()->AsLeafTextPosition()));
|
|
}
|
|
+#endif
|
|
}
|
|
|
|
- (id)accessibilityFocusedUIElement {
|
|
diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm
|
|
index 840b1935491804b9ac2fd6f0c8ef1aa32f31a9ae..208d4c32864a9c6142b544488951596aa2ab115b 100644
|
|
--- a/content/browser/accessibility/browser_accessibility_manager_mac.mm
|
|
+++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm
|
|
@@ -496,7 +496,7 @@ void PostAnnouncementNotification(NSString* announcement) {
|
|
if (native_focus_object && [native_focus_object instanceActive]) {
|
|
[user_info setObject:native_focus_object
|
|
forKey:ui::NSAccessibilityTextChangeElement];
|
|
-
|
|
+#ifndef MAS_BUILD
|
|
id selected_text = [native_focus_object selectedTextMarkerRange];
|
|
if (selected_text) {
|
|
NSString* const NSAccessibilitySelectedTextMarkerRangeAttribute =
|
|
@@ -504,6 +504,7 @@ void PostAnnouncementNotification(NSString* announcement) {
|
|
[user_info setObject:selected_text
|
|
forKey:NSAccessibilitySelectedTextMarkerRangeAttribute];
|
|
}
|
|
+#endif
|
|
}
|
|
|
|
return user_info;
|
|
diff --git a/content/renderer/renderer_main_platform_delegate_mac.mm b/content/renderer/renderer_main_platform_delegate_mac.mm
|
|
index 894ac47e596c1c96a7e0659be80ed8a5629d0304..eca797a24df79b8502b9698e6ed8830ad1c5cb59 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"
|
|
|
|
+#ifndef MAS_BUILD
|
|
extern "C" {
|
|
CGError CGSSetDenyWindowServerConnections(bool);
|
|
}
|
|
+#endif
|
|
|
|
namespace content {
|
|
|
|
@@ -22,6 +24,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.
|
|
@@ -30,6 +33,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 c15f3a631292b538698625328fb429ee3c9964f5..37e038753ecf1b82ec92c06b2c0729b5328781c9 100644
|
|
--- a/content/renderer/theme_helper_mac.mm
|
|
+++ b/content/renderer/theme_helper_mac.mm
|
|
@@ -7,11 +7,11 @@
|
|
#include <Cocoa/Cocoa.h>
|
|
|
|
#include "base/strings/sys_string_conversions.h"
|
|
-
|
|
+#if !defined(MAS_BUILD)
|
|
extern "C" {
|
|
bool CGFontRenderingGetFontSmoothingDisabled(void) API_AVAILABLE(macos(10.14));
|
|
}
|
|
-
|
|
+#endif
|
|
namespace content {
|
|
|
|
void SystemColorsDidChange(int aqua_color_variant,
|
|
@@ -59,8 +59,19 @@ void SystemColorsDidChange(int aqua_color_variant,
|
|
bool IsSubpixelAntialiasingAvailable() {
|
|
if (__builtin_available(macOS 10.14, *)) {
|
|
// See https://trac.webkit.org/changeset/239306/webkit for more info.
|
|
+#if !defined(MAS_BUILD)
|
|
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
|
|
}
|
|
+
|
|
return true;
|
|
}
|
|
|
|
diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm
|
|
index 717daca205b64ddbaf138f88400683dafac1a270..50ce32674525567b24b387e64b27f815585e61a0 100644
|
|
--- a/device/bluetooth/bluetooth_adapter_mac.mm
|
|
+++ b/device/bluetooth/bluetooth_adapter_mac.mm
|
|
@@ -42,6 +42,7 @@
|
|
#include "device/bluetooth/bluetooth_socket_mac.h"
|
|
#include "device/bluetooth/public/cpp/bluetooth_address.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
|
|
@@ -55,6 +56,7 @@
|
|
// [4] https://support.apple.com/kb/PH25091
|
|
void IOBluetoothPreferenceSetControllerPowerState(int state);
|
|
}
|
|
+#endif
|
|
|
|
namespace {
|
|
|
|
@@ -123,8 +125,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
|
|
classic_discovery_manager_(
|
|
BluetoothDiscoveryManagerMac::CreateClassic(this)),
|
|
low_energy_discovery_manager_(
|
|
@@ -355,8 +359,12 @@ CBCentralManagerState GetCBManagerState(CBCentralManager* manager) {
|
|
}
|
|
|
|
bool BluetoothAdapterMac::SetPoweredImpl(bool powered) {
|
|
+#ifndef MAS_BUILD
|
|
power_state_function_.Run(base::strict_cast<int>(powered));
|
|
return true;
|
|
+#else
|
|
+ return false;
|
|
+#endif
|
|
}
|
|
|
|
void BluetoothAdapterMac::RemovePairingDelegateInternal(
|
|
diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn
|
|
index d7a46d050eb2ab63849397cf0d36a23f193a8413..1396a4b8ed4d5ec761d4026a564447ccb4cd168b 100644
|
|
--- a/media/audio/BUILD.gn
|
|
+++ b/media/audio/BUILD.gn
|
|
@@ -175,6 +175,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",
|
|
+ ]
|
|
+ }
|
|
frameworks = [
|
|
"AudioToolbox.framework",
|
|
"AudioUnit.framework",
|
|
diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc
|
|
index 261596b9b7414e5c732bef945610c0cdf1384da8..f58ac1d55acac1895391579275a12b0f9802491d 100644
|
|
--- a/media/audio/mac/audio_manager_mac.cc
|
|
+++ b/media/audio/mac/audio_manager_mac.cc
|
|
@@ -883,7 +883,7 @@ AudioParameters AudioManagerMac::GetPreferredOutputStreamParameters(
|
|
|
|
void AudioManagerMac::InitializeOnAudioThread() {
|
|
DCHECK(GetTaskRunner()->BelongsToCurrentThread());
|
|
- InitializeCoreAudioDispatchOverride();
|
|
+ // InitializeCoreAudioDispatchOverride();
|
|
power_observer_ = std::make_unique<AudioPowerObserver>();
|
|
}
|
|
|
|
diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc
|
|
index 2de14574f1b7e848fc03ff1071fddf8307bc9ea2..75a86416bad754f1e9c92afb2fad27a501b9cc6c 100644
|
|
--- a/net/dns/dns_config_service_posix.cc
|
|
+++ b/net/dns/dns_config_service_posix.cc
|
|
@@ -136,8 +136,8 @@ class DnsConfigServicePosix::Watcher : public DnsConfigService::Watcher {
|
|
|
|
bool Watch() override {
|
|
CheckOnCorrectSequence();
|
|
-
|
|
bool success = true;
|
|
+#ifndef MAS_BUILD
|
|
if (!config_watcher_.Watch(base::BindRepeating(&Watcher::OnConfigChanged,
|
|
base::Unretained(this)))) {
|
|
LOG(ERROR) << "DNS config watch failed to start.";
|
|
@@ -154,6 +154,7 @@ class DnsConfigServicePosix::Watcher : public DnsConfigService::Watcher {
|
|
success = false;
|
|
}
|
|
#endif // !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<const char*> 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 e0c31170acd13c9997c6b1d04c6de1420feaf422..0e561f97b33380bfbe52e64c2c4a6988095e8074 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 84c7370a3bb98aa29cdc04730a25148c3adc162a..5175c2c210e13e41224ae7268528c595c35cc4dc 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"
|
|
|
|
+#ifndef MAS_BUILD
|
|
// libsandbox private API.
|
|
extern "C" {
|
|
extern const char* APP_SANDBOX_READ;
|
|
@@ -21,6 +22,7 @@ char* sandbox_extension_issue_file(const char* type,
|
|
const char* path,
|
|
uint32_t flags);
|
|
}
|
|
+#endif
|
|
|
|
namespace sandbox {
|
|
|
|
@@ -49,7 +51,11 @@ std::unique_ptr<SeatbeltExtension> 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;
|
|
}
|
|
|
|
@@ -61,7 +67,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;
|
|
@@ -79,9 +89,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;
|