Diff
Modified: branches/safari-612-branch/Source/WebCore/ChangeLog (285507 => 285508)
--- branches/safari-612-branch/Source/WebCore/ChangeLog 2021-11-09 18:25:22 UTC (rev 285507)
+++ branches/safari-612-branch/Source/WebCore/ChangeLog 2021-11-09 18:51:26 UTC (rev 285508)
@@ -47,54 +47,6 @@
2021-11-08 Kocsen Chung <kocsen_ch...@apple.com>
- Cherry-pick r285236. rdar://problem/83950623
-
- AX: WKAccessibilityWebPageObjectMac.mm should expose accessibilityChildrenInNavigationOrder and NSAccessibilityChildrenInNavigationOrderAttribute
- https://bugs.webkit.org/show_bug.cgi?id=232654
-
- Patch by Tyler Wilcock <tyle...@apple.com> on 2021-11-03
- Reviewed by Chris Fleizach.
-
- Some clients expect accessibilityChildrenInNavigationOrder and
- NSAccessibilityChildrenInNavigationOrderAttribute to be available,
- and WKAccessibilityWebPageObjectMac didn't expose them.
-
- Source/WebCore:
-
- * accessibility/mac/WebAccessibilityObjectWrapperMac.h:
- * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
- Move #define NSAccessibilityChildrenInNavigationOrderAttribute to
- header so it can be used in the WebKit layer.
-
- Source/WebKit:
-
- * WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm:
- (-[WKAccessibilityWebPageObject accessibilityChildrenInNavigationOrder]): Added.
- (-[WKAccessibilityWebPageObject accessibilityAttributeValue:]):
- Handle NSAccessibilityChildrenInNavigationOrderAttribute.
- (-[WKAccessibilityWebPageObject accessibilityAttributeNames:]):
- Add NSAccessibilityChildrenInNavigationOrderAttribute.
-
- git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285236 268f45cc-cd09-0410-ab3c-d52691b4dbfc
-
- 2021-11-03 Tyler Wilcock <tyle...@apple.com>
-
- AX: WKAccessibilityWebPageObjectMac.mm should expose accessibilityChildrenInNavigationOrder and NSAccessibilityChildrenInNavigationOrderAttribute
- https://bugs.webkit.org/show_bug.cgi?id=232654
-
- Reviewed by Chris Fleizach.
-
- Some clients expect accessibilityChildrenInNavigationOrder and
- NSAccessibilityChildrenInNavigationOrderAttribute to be available,
- and WKAccessibilityWebPageObjectMac didn't expose them.
-
- * accessibility/mac/WebAccessibilityObjectWrapperMac.h:
- * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
- Move #define NSAccessibilityChildrenInNavigationOrderAttribute to
- header so it can be used in the WebKit layer.
-
-2021-11-08 Kocsen Chung <kocsen_ch...@apple.com>
-
Cherry-pick r283470. rdar://problem/85166382
WebCore::Length incorrectly uses memcpy() for copy constructors/operator and IPC encoding/decoding
Modified: branches/safari-612-branch/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.h (285507 => 285508)
--- branches/safari-612-branch/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.h 2021-11-09 18:25:22 UTC (rev 285507)
+++ branches/safari-612-branch/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.h 2021-11-09 18:51:26 UTC (rev 285508)
@@ -37,10 +37,6 @@
#define NSAccessibilityPrimaryScreenHeightAttribute @"_AXPrimaryScreenHeight"
#endif
-#ifndef NSAccessibilityChildrenInNavigationOrderAttribute
-#define NSAccessibilityChildrenInNavigationOrderAttribute @"AXChildrenInNavigationOrder"
-#endif
-
@interface WebAccessibilityObjectWrapper : WebAccessibilityObjectWrapperBase
// FIXME: Remove these methods since clients should not need to call them and hence should not be exposed in the public interface.
Modified: branches/safari-612-branch/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (285507 => 285508)
--- branches/safari-612-branch/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2021-11-09 18:25:22 UTC (rev 285507)
+++ branches/safari-612-branch/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2021-11-09 18:51:26 UTC (rev 285508)
@@ -150,6 +150,10 @@
#define NSAccessibilityBlockQuoteLevelAttribute @"AXBlockQuoteLevel"
#endif
+#ifndef NSAccessibilityChildrenInNavigationOrderAttribute
+#define NSAccessibilityChildrenInNavigationOrderAttribute @"AXChildrenInNavigationOrder"
+#endif
+
#ifndef NSAccessibilityAccessKeyAttribute
#define NSAccessibilityAccessKeyAttribute @"AXAccessKey"
#endif
Modified: branches/safari-612-branch/Source/WebKit/ChangeLog (285507 => 285508)
--- branches/safari-612-branch/Source/WebKit/ChangeLog 2021-11-09 18:25:22 UTC (rev 285507)
+++ branches/safari-612-branch/Source/WebKit/ChangeLog 2021-11-09 18:51:26 UTC (rev 285508)
@@ -1,55 +1,5 @@
2021-11-08 Kocsen Chung <kocsen_ch...@apple.com>
- Cherry-pick r285236. rdar://problem/83950623
-
- AX: WKAccessibilityWebPageObjectMac.mm should expose accessibilityChildrenInNavigationOrder and NSAccessibilityChildrenInNavigationOrderAttribute
- https://bugs.webkit.org/show_bug.cgi?id=232654
-
- Patch by Tyler Wilcock <tyle...@apple.com> on 2021-11-03
- Reviewed by Chris Fleizach.
-
- Some clients expect accessibilityChildrenInNavigationOrder and
- NSAccessibilityChildrenInNavigationOrderAttribute to be available,
- and WKAccessibilityWebPageObjectMac didn't expose them.
-
- Source/WebCore:
-
- * accessibility/mac/WebAccessibilityObjectWrapperMac.h:
- * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
- Move #define NSAccessibilityChildrenInNavigationOrderAttribute to
- header so it can be used in the WebKit layer.
-
- Source/WebKit:
-
- * WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm:
- (-[WKAccessibilityWebPageObject accessibilityChildrenInNavigationOrder]): Added.
- (-[WKAccessibilityWebPageObject accessibilityAttributeValue:]):
- Handle NSAccessibilityChildrenInNavigationOrderAttribute.
- (-[WKAccessibilityWebPageObject accessibilityAttributeNames:]):
- Add NSAccessibilityChildrenInNavigationOrderAttribute.
-
- git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285236 268f45cc-cd09-0410-ab3c-d52691b4dbfc
-
- 2021-11-03 Tyler Wilcock <tyle...@apple.com>
-
- AX: WKAccessibilityWebPageObjectMac.mm should expose accessibilityChildrenInNavigationOrder and NSAccessibilityChildrenInNavigationOrderAttribute
- https://bugs.webkit.org/show_bug.cgi?id=232654
-
- Reviewed by Chris Fleizach.
-
- Some clients expect accessibilityChildrenInNavigationOrder and
- NSAccessibilityChildrenInNavigationOrderAttribute to be available,
- and WKAccessibilityWebPageObjectMac didn't expose them.
-
- * WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm:
- (-[WKAccessibilityWebPageObject accessibilityChildrenInNavigationOrder]): Added.
- (-[WKAccessibilityWebPageObject accessibilityAttributeValue:]):
- Handle NSAccessibilityChildrenInNavigationOrderAttribute.
- (-[WKAccessibilityWebPageObject accessibilityAttributeNames:]):
- Add NSAccessibilityChildrenInNavigationOrderAttribute.
-
-2021-11-08 Kocsen Chung <kocsen_ch...@apple.com>
-
Cherry-pick r285219. rdar://problem/84686676
[Catalina] HLS streams will not select HDR variants when GPU Process is enabled
Modified: branches/safari-612-branch/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm (285507 => 285508)
--- branches/safari-612-branch/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm 2021-11-09 18:25:22 UTC (rev 285507)
+++ branches/safari-612-branch/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm 2021-11-09 18:51:26 UTC (rev 285508)
@@ -82,7 +82,7 @@
m_attributeNames = adoptNS([[NSArray alloc] initWithObjects:
NSAccessibilityRoleAttribute, NSAccessibilityRoleDescriptionAttribute, NSAccessibilityFocusedAttribute,
NSAccessibilityParentAttribute, NSAccessibilityWindowAttribute, NSAccessibilityTopLevelUIElementAttribute,
- NSAccessibilityPositionAttribute, NSAccessibilitySizeAttribute, NSAccessibilityChildrenAttribute, NSAccessibilityChildrenInNavigationOrderAttribute, NSAccessibilityPrimaryScreenHeightAttribute, nil]);
+ NSAccessibilityPositionAttribute, NSAccessibilitySizeAttribute, NSAccessibilityChildrenAttribute, NSAccessibilityPrimaryScreenHeightAttribute, nil]);
return m_attributeNames.get();
}
@@ -153,11 +153,6 @@
return @[wrapper];
}
-- (NSArray *)accessibilityChildrenInNavigationOrder
-{
- return [self accessibilityChildren];
-}
-
ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
- (id)accessibilityAttributeValue:(NSString *)attribute
ALLOW_DEPRECATED_IMPLEMENTATIONS_END
@@ -198,10 +193,6 @@
if ([attribute isEqualToString:NSAccessibilityChildrenAttribute])
return [self accessibilityChildren];
- // [self accessibilityChildren] is just the root object, so it's already in navigation order.
- if ([attribute isEqualToString:NSAccessibilityChildrenInNavigationOrderAttribute])
- return [self accessibilityChildren];
-
return nil;
}
