mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to 7dff37844cb3 (master) (#18059)

Browse source
This commit is contained in:
Electron Bot 2019-04-30 20:18:22 -04:00 • committed by Jeremy Apthorp
parent 00358545a9
commit 2616911f7a
77 changed files with 1636 additions and 294 deletions
Download patch file Download diff file Expand all files Collapse all files

36
patches/common/chromium/mas_no_private_api.patch
View file

@ -38,7 +38,7 @@ index d38fa48b8b890d90f2911995a2a51c249005c827..5fe68c71fe101a307ef565013a91b109
// 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 575957842225a102337a71fe2a4a10625505a647..01ee760aa0853517631add692e7e8279cada714c 100644
index 21934df3a2bf46d54f65bff09ccd7c02b9fb6a40..0c1c8850f50808aab44892221d834f496b15ca99 100644
--- a/content/browser/accessibility/browser_accessibility_cocoa.mm
+++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
@@ -141,6 +141,7 @@
@ -49,7 +49,7 @@ index 575957842225a102337a71fe2a4a10625505a647..01ee760aa0853517631add692e7e8279
extern "C" {
// The following are private accessibility APIs required for cursor navigation
@@ -345,6 +346,7 @@ void AddMisspelledTextAttributes(
@@ -346,6 +347,7 @@ void AddMisspelledTextAttributes(
AddMisspelledTextAttributes(text_only_objects, attributed_text);
return [attributed_text attributedSubstringFromRange:range];
}
@ -57,7 +57,7 @@ index 575957842225a102337a71fe2a4a10625505a647..01ee760aa0853517631add692e7e8279
// Returns an autoreleased copy of the AXNodeData's attribute.
NSString* NSStringForStringAttribute(BrowserAccessibility* browserAccessibility,
@@ -612,7 +614,9 @@ + (void)initialize {
@@ -613,7 +615,9 @@ + (void)initialize {
{NSAccessibilityEditableAncestorAttribute, @"editableAncestor"},
{NSAccessibilityElementBusyAttribute, @"elementBusy"},
{NSAccessibilityEnabledAttribute, @"enabled"},
@ -67,7 +67,7 @@ index 575957842225a102337a71fe2a4a10625505a647..01ee760aa0853517631add692e7e8279
{NSAccessibilityExpandedAttribute, @"expanded"},
{NSAccessibilityFocusableAncestorAttribute, @"focusableAncestor"},
{NSAccessibilityFocusedAttribute, @"focused"},
@@ -647,13 +651,17 @@ + (void)initialize {
@@ -648,13 +652,17 @@ + (void)initialize {
{NSAccessibilityRowsAttribute, @"rows"},
// TODO(aboxhall): expose
// NSAccessibilityServesAsTitleForUIElementsAttribute
@ -85,7 +85,7 @@ index 575957842225a102337a71fe2a4a10625505a647..01ee760aa0853517631add692e7e8279
{NSAccessibilitySizeAttribute, @"size"},
{NSAccessibilitySortDirectionAttribute, @"sortDirection"},
{NSAccessibilitySubroleAttribute, @"subrole"},
@@ -1142,6 +1150,7 @@ - (NSNumber*)enabled {
@@ -1143,6 +1151,7 @@ - (NSNumber*)enabled {
ax::mojom::Restriction::kDisabled];
}
@ -93,7 +93,7 @@ index 575957842225a102337a71fe2a4a10625505a647..01ee760aa0853517631add692e7e8279
// Returns a text marker that points to the last character in the document that
// can be selected with VoiceOver.
- (id)endTextMarker {
@@ -1152,6 +1161,7 @@ - (id)endTextMarker {
@@ -1153,6 +1162,7 @@ - (id)endTextMarker {
BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0);
return CreateTextMarker(position->CreatePositionAtEndOfAnchor());
}
@ -101,7 +101,7 @@ index 575957842225a102337a71fe2a4a10625505a647..01ee760aa0853517631add692e7e8279
- (NSNumber*)expanded {
if (![self instanceActive])
@@ -2027,6 +2037,7 @@ - (NSValue*)selectedTextRange {
@@ -2028,6 +2038,7 @@ - (NSValue*)selectedTextRange {
return [NSValue valueWithRange:NSMakeRange(selStart, selLength)];
}
@ -109,7 +109,7 @@ index 575957842225a102337a71fe2a4a10625505a647..01ee760aa0853517631add692e7e8279
- (id)selectedTextMarkerRange {
if (![self instanceActive])
return nil;
@@ -2059,6 +2070,7 @@ - (id)selectedTextMarkerRange {
@@ -2060,6 +2071,7 @@ - (id)selectedTextMarkerRange {
anchorAffinity, *focusObject,
focusOffset, focusAffinity));
}
@ -117,7 +117,7 @@ index 575957842225a102337a71fe2a4a10625505a647..01ee760aa0853517631add692e7e8279
- (NSValue*)size {
if (![self instanceActive])
@@ -2091,6 +2103,7 @@ - (NSString*)sortDirection {
@@ -2092,6 +2104,7 @@ - (NSString*)sortDirection {
return nil;
}
@ -125,7 +125,7 @@ index 575957842225a102337a71fe2a4a10625505a647..01ee760aa0853517631add692e7e8279
// Returns a text marker that points to the first character in the document that
// can be selected with VoiceOver.
- (id)startTextMarker {
@@ -2101,6 +2114,7 @@ - (id)startTextMarker {
@@ -2102,6 +2115,7 @@ - (id)startTextMarker {
BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0);
return CreateTextMarker(position->CreatePositionAtStartOfAnchor());
}
@ -133,7 +133,7 @@ index 575957842225a102337a71fe2a4a10625505a647..01ee760aa0853517631add692e7e8279
// Returns a subrole based upon the role.
- (NSString*)subrole {
@@ -2401,12 +2415,14 @@ - (NSAttributedString*)attributedValueForRange:(NSRange)range {
@@ -2402,12 +2416,14 @@ - (NSAttributedString*)attributedValueForRange:(NSRange)range {
NSMutableAttributedString* attributedValue =
[[[NSMutableAttributedString alloc] initWithString:value] autorelease];
@ -148,7 +148,7 @@ index 575957842225a102337a71fe2a4a10625505a647..01ee760aa0853517631add692e7e8279
return [attributedValue attributedSubstringFromRange:range];
}
@@ -2491,6 +2507,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
@@ -2492,6 +2508,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
return ToBrowserAccessibilityCocoa(cell);
}
@ -156,7 +156,7 @@ index 575957842225a102337a71fe2a4a10625505a647..01ee760aa0853517631add692e7e8279
if ([attribute isEqualToString:@"AXUIElementForTextMarker"]) {
BrowserAccessibilityPositionInstance position =
CreatePositionFromTextMarker(parameter);
@@ -2668,6 +2685,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
@@ -2669,6 +2686,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
NSString* text = GetTextForTextMarkerRange(parameter);
return [NSNumber numberWithInt:[text length]];
}
@ -164,7 +164,7 @@ index 575957842225a102337a71fe2a4a10625505a647..01ee760aa0853517631add692e7e8279
if ([attribute isEqualToString:
NSAccessibilityBoundsForRangeParameterizedAttribute]) {
@@ -2701,6 +2719,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
@@ -2702,6 +2720,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
return nil;
}
@ -172,7 +172,7 @@ index 575957842225a102337a71fe2a4a10625505a647..01ee760aa0853517631add692e7e8279
if ([attribute
isEqualToString:
NSAccessibilityLineTextMarkerRangeForTextMarkerParameterizedAttribute]) {
@@ -2780,6 +2799,7 @@ AXPlatformRange range(position->CreatePreviousLineStartPosition(
@@ -2782,6 +2801,7 @@ AXPlatformRange range(position->CreatePreviousLineStartPosition(
return @(child->GetIndexInParent());
}
@ -181,10 +181,10 @@ index 575957842225a102337a71fe2a4a10625505a647..01ee760aa0853517631add692e7e8279
return nil;
}
diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm
index eb2f9c29b30b016eff979e06a432f804c4318503..a76f1aa4e24346dabb94089c77a260c9b6b19243 100644
index 350a17a75fed37eb887560956a6e5378a1b46759..e298becdb574fd254c131068ace58c0d1be49043 100644
--- a/content/browser/accessibility/browser_accessibility_manager_mac.mm
+++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm
@@ -484,6 +484,7 @@ void PostAnnouncementNotification(NSString* announcement) {
@@ -485,6 +485,7 @@ void PostAnnouncementNotification(NSString* announcement) {
[user_info setObject:native_focus_object
forKey:NSAccessibilityTextChangeElement];
@ -192,7 +192,7 @@ index eb2f9c29b30b016eff979e06a432f804c4318503..a76f1aa4e24346dabb94089c77a260c9
id selected_text = [native_focus_object selectedTextMarkerRange];
if (selected_text) {
NSString* const NSAccessibilitySelectedTextMarkerRangeAttribute =
@@ -491,6 +492,7 @@ void PostAnnouncementNotification(NSString* announcement) {
@@ -492,6 +493,7 @@ void PostAnnouncementNotification(NSString* announcement) {
[user_info setObject:selected_text
forKey:NSAccessibilitySelectedTextMarkerRangeAttribute];
}