mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
fix: cherry-pick 8f5a08079948 from chromium (#26469)
This commit is contained in:
Jeremy Rose
@@ -103,3 +103,4 @@ chore_expose_v8_initialization_isolate_callbacks.patch
|
||||
rename_the_v8_context_snapshot_on_arm64_macos_builds.patch
|
||||
crashpad-initialize-logging.patch
|
||||
fix_properly_honor_printing_page_ranges.patch
|
||||
cherry-pick-8f5a08079948.patch
|
||||
|
||||
115
patches/chromium/cherry-pick-8f5a08079948.patch
Normal file
115
patches/chromium/cherry-pick-8f5a08079948.patch
Normal file
@@ -0,0 +1,115 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Robinson <mrobinson@igalia.com>
|
||||
Date: Mon, 26 Oct 2020 23:12:55 +0000
|
||||
Subject: Expose a11y popup menu type via the name "AXPopupValue" on Mac
|
||||
|
||||
This value was exposed via the name "AXHasPopupValue", while WebKit
|
||||
exposes this value via "AXPopupValue." Fix the attribute name, which in
|
||||
turn fixes an issue with how popup buttons are announced in VoiceOver.
|
||||
|
||||
Bug: 1129678
|
||||
Change-Id: Iede26b2fd6ddb9d7717fcb47fd1dd1cce5b74075
|
||||
AX-Relnotes: Fix an issue with the announcement of popup buttons in VoiceOver.
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2489985
|
||||
Commit-Queue: Aaron Leventhal <aleventhal@chromium.org>
|
||||
Reviewed-by: Aaron Leventhal <aleventhal@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/master@{#820964}
|
||||
|
||||
diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm
|
||||
index 3abd9933ab325bda6cb486a41fd6c8b246aa8e71..17aa494d6473866721a8cc5f4c5c646af9307d93 100644
|
||||
--- a/content/browser/accessibility/browser_accessibility_cocoa.mm
|
||||
+++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
|
||||
@@ -92,7 +92,7 @@
|
||||
@"AXFocusableAncestor";
|
||||
NSString* const NSAccessibilityGrabbedAttribute = @"AXGrabbed";
|
||||
NSString* const NSAccessibilityHasPopupAttribute = @"AXHasPopup";
|
||||
-NSString* const NSAccessibilityHasPopupValueAttribute = @"AXHasPopupValue";
|
||||
+NSString* const NSAccessibilityPopupValueAttribute = @"AXPopupValue";
|
||||
NSString* const NSAccessibilityHighestEditableAncestorAttribute =
|
||||
@"AXHighestEditableAncestor";
|
||||
NSString* const NSAccessibilityInvalidAttribute = @"AXInvalid";
|
||||
@@ -836,7 +836,7 @@ + (void)initialize {
|
||||
{NSAccessibilityGrabbedAttribute, @"grabbed"},
|
||||
{NSAccessibilityHeaderAttribute, @"header"},
|
||||
{NSAccessibilityHasPopupAttribute, @"hasPopup"},
|
||||
- {NSAccessibilityHasPopupValueAttribute, @"hasPopupValue"},
|
||||
+ {NSAccessibilityPopupValueAttribute, @"popupValue"},
|
||||
{NSAccessibilityHelpAttribute, @"help"},
|
||||
{NSAccessibilityHighestEditableAncestorAttribute,
|
||||
@"highestEditableAncestor"},
|
||||
@@ -1411,7 +1411,7 @@ - (NSNumber*)hasPopup {
|
||||
return @(_owner->HasIntAttribute(ax::mojom::IntAttribute::kHasPopup));
|
||||
}
|
||||
|
||||
-- (NSString*)hasPopupValue {
|
||||
+- (NSString*)popupValue {
|
||||
if (![self instanceActive])
|
||||
return nil;
|
||||
int hasPopup = _owner->GetIntAttribute(ax::mojom::IntAttribute::kHasPopup);
|
||||
@@ -3586,7 +3586,7 @@ - (NSArray*)accessibilityAttributeNames {
|
||||
|
||||
if (_owner->HasIntAttribute(ax::mojom::IntAttribute::kHasPopup)) {
|
||||
[ret addObjectsFromArray:@[
|
||||
- NSAccessibilityHasPopupAttribute, NSAccessibilityHasPopupValueAttribute
|
||||
+ NSAccessibilityHasPopupAttribute, NSAccessibilityPopupValueAttribute
|
||||
]];
|
||||
}
|
||||
|
||||
diff --git a/content/test/data/accessibility/aria/aria-haspopup-expected-mac.txt b/content/test/data/accessibility/aria/aria-haspopup-expected-mac.txt
|
||||
index e988b9fe7d061fa3aa6930ababa4f32c095bd8a3..de0f31f2065490d6085027e2800706a3926bcf5b 100644
|
||||
--- a/content/test/data/accessibility/aria/aria-haspopup-expected-mac.txt
|
||||
+++ b/content/test/data/accessibility/aria/aria-haspopup-expected-mac.txt
|
||||
@@ -1,10 +1,10 @@
|
||||
AXWebArea
|
||||
-++AXPopUpButton AXHasPopup=1 AXHasPopupValue='menu'
|
||||
+++AXPopUpButton AXHasPopup=1 AXPopupValue='menu'
|
||||
++AXPopUpButton
|
||||
-++AXPopUpButton AXHasPopup=1 AXHasPopupValue='menu'
|
||||
-++AXPopUpButton AXHasPopup=1 AXHasPopupValue='listbox'
|
||||
-++AXPopUpButton AXHasPopup=1 AXHasPopupValue='grid'
|
||||
-++AXPopUpButton AXHasPopup=1 AXHasPopupValue='dialog'
|
||||
-++AXPopUpButton AXHasPopup=1 AXHasPopupValue='menu'
|
||||
-++AXPopUpButton AXHasPopup=1 AXHasPopupValue='listbox'
|
||||
-++AXPopUpButton AXHasPopup=1 AXHasPopupValue='listbox'
|
||||
+++AXPopUpButton AXHasPopup=1 AXPopupValue='menu'
|
||||
+++AXPopUpButton AXHasPopup=1 AXPopupValue='listbox'
|
||||
+++AXPopUpButton AXHasPopup=1 AXPopupValue='grid'
|
||||
+++AXPopUpButton AXHasPopup=1 AXPopupValue='dialog'
|
||||
+++AXPopUpButton AXHasPopup=1 AXPopupValue='menu'
|
||||
+++AXPopUpButton AXHasPopup=1 AXPopupValue='listbox'
|
||||
+++AXPopUpButton AXHasPopup=1 AXPopupValue='listbox'
|
||||
diff --git a/content/test/data/accessibility/aria/aria-haspopup.html b/content/test/data/accessibility/aria/aria-haspopup.html
|
||||
index 026397c4e9ad805f5facfc499cc986cd0763aef3..7d982745e89b8346bf71eee90110fe6a96648629 100644
|
||||
--- a/content/test/data/accessibility/aria/aria-haspopup.html
|
||||
+++ b/content/test/data/accessibility/aria/aria-haspopup.html
|
||||
@@ -3,7 +3,7 @@
|
||||
@MAC-ALLOW:AXShowMenu*
|
||||
@MAC-ALLOW:AXPress*
|
||||
@MAC-ALLOW:AXHasPopup
|
||||
-@MAC-ALLOW:AXHasPopupValue
|
||||
+@MAC-ALLOW:AXPopupValue
|
||||
@WIN-ALLOW:EXPANDED*
|
||||
@WIN-ALLOW:HASPOPUP*
|
||||
@WIN-ALLOW:haspopup*
|
||||
diff --git a/content/test/data/accessibility/html/input-suggestions-source-element-expected-mac.txt b/content/test/data/accessibility/html/input-suggestions-source-element-expected-mac.txt
|
||||
index 4b0bde650deed34edead37ffabd3eda2d7a82b49..38ca751991f564f9a24ba131652014f161d4b996 100644
|
||||
--- a/content/test/data/accessibility/html/input-suggestions-source-element-expected-mac.txt
|
||||
+++ b/content/test/data/accessibility/html/input-suggestions-source-element-expected-mac.txt
|
||||
@@ -1,3 +1,3 @@
|
||||
AXWebArea AXRoleDescription='HTML content'
|
||||
++AXGroup AXRoleDescription='group'
|
||||
-++++AXComboBox AXAutocompleteValue='list' AXHasPopup=1 AXHasPopupValue='listbox' AXRoleDescription='combo box'
|
||||
+++++AXComboBox AXAutocompleteValue='list' AXHasPopup=1 AXPopupValue='listbox' AXRoleDescription='combo box'
|
||||
diff --git a/content/test/data/accessibility/html/input-suggestions-source-element.html b/content/test/data/accessibility/html/input-suggestions-source-element.html
|
||||
index 039ac5855e1122b34dad0c1fae42f798791b7890..d024f17de3d3b04029c532e616140e20afa87549 100644
|
||||
--- a/content/test/data/accessibility/html/input-suggestions-source-element.html
|
||||
+++ b/content/test/data/accessibility/html/input-suggestions-source-element.html
|
||||
@@ -1,7 +1,7 @@
|
||||
<!--
|
||||
@MAC-ALLOW:AXRoleDescription
|
||||
@MAC-ALLOW:AXHasPopup
|
||||
-@MAC-ALLOW:AXHasPopupValue
|
||||
+@MAC-ALLOW:AXPopupValue
|
||||
@WIN-ALLOW:haspopup*
|
||||
@AURALINUX-ALLOW:haspopup*
|
||||
@AURALINUX-ALLOW:supports-autocompletion
|
||||
Reference in New Issue
Block a user