<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[285508] branches/safari-612-branch/Source</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/285508">285508</a></dd>
<dt>Author</dt> <dd>alancoon@apple.com</dd>
<dt>Date</dt> <dd>2021-11-09 10:51:26 -0800 (Tue, 09 Nov 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Revert <a href="http://trac.webkit.org/projects/webkit/changeset/285236">r285236</a>. rdar://problem/83950623

This reverts <a href="http://trac.webkit.org/projects/webkit/changeset/285470">r285470</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari612branchSourceWebCoreChangeLog">branches/safari-612-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari612branchSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMach">branches/safari-612-branch/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.h</a></li>
<li><a href="#branchessafari612branchSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm">branches/safari-612-branch/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm</a></li>
<li><a href="#branchessafari612branchSourceWebKitChangeLog">branches/safari-612-branch/Source/WebKit/ChangeLog</a></li>
<li><a href="#branchessafari612branchSourceWebKitWebProcessWebPagemacWKAccessibilityWebPageObjectMacmm">branches/safari-612-branch/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari612branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/ChangeLog (285507 => 285508)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -47,54 +47,6 @@
</span><span class="cx"> 
</span><span class="cx"> 2021-11-08  Kocsen Chung  <kocsen_chung@apple.com>
</span><span class="cx"> 
</span><del>-        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 <tyler_w@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  <tyler_w@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_chung@apple.com>
-
</del><span class="cx">         Cherry-pick r283470. rdar://problem/85166382
</span><span class="cx"> 
</span><span class="cx">     WebCore::Length incorrectly uses memcpy() for copy constructors/operator and IPC encoding/decoding
</span></span></pre></div>
<a id="branchessafari612branchSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMach"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.h (285507 => 285508)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -37,10 +37,6 @@
</span><span class="cx"> #define NSAccessibilityPrimaryScreenHeightAttribute @"_AXPrimaryScreenHeight"
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#ifndef NSAccessibilityChildrenInNavigationOrderAttribute
-#define NSAccessibilityChildrenInNavigationOrderAttribute @"AXChildrenInNavigationOrder"
-#endif
-
</del><span class="cx"> @interface WebAccessibilityObjectWrapper : WebAccessibilityObjectWrapperBase
</span><span class="cx"> 
</span><span class="cx"> // FIXME: Remove these methods since clients should not need to call them and hence should not be exposed in the public interface.
</span></span></pre></div>
<a id="branchessafari612branchSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (285507 => 285508)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -150,6 +150,10 @@
</span><span class="cx"> #define NSAccessibilityBlockQuoteLevelAttribute @"AXBlockQuoteLevel"
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#ifndef NSAccessibilityChildrenInNavigationOrderAttribute
+#define NSAccessibilityChildrenInNavigationOrderAttribute @"AXChildrenInNavigationOrder"
+#endif
+
</ins><span class="cx"> #ifndef NSAccessibilityAccessKeyAttribute
</span><span class="cx"> #define NSAccessibilityAccessKeyAttribute @"AXAccessKey"
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari612branchSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebKit/ChangeLog (285507 => 285508)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,55 +1,5 @@
</span><span class="cx"> 2021-11-08  Kocsen Chung  <kocsen_chung@apple.com>
</span><span class="cx"> 
</span><del>-        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 <tyler_w@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  <tyler_w@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_chung@apple.com>
-
</del><span class="cx">         Cherry-pick r285219. rdar://problem/84686676
</span><span class="cx"> 
</span><span class="cx">     [Catalina] HLS streams will not select HDR variants when GPU Process is enabled
</span></span></pre></div>
<a id="branchessafari612branchSourceWebKitWebProcessWebPagemacWKAccessibilityWebPageObjectMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm (285507 => 285508)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx">         m_attributeNames = adoptNS([[NSArray alloc] initWithObjects:
</span><span class="cx">                             NSAccessibilityRoleAttribute, NSAccessibilityRoleDescriptionAttribute, NSAccessibilityFocusedAttribute,
</span><span class="cx">                             NSAccessibilityParentAttribute, NSAccessibilityWindowAttribute, NSAccessibilityTopLevelUIElementAttribute,
</span><del>-                            NSAccessibilityPositionAttribute, NSAccessibilitySizeAttribute, NSAccessibilityChildrenAttribute, NSAccessibilityChildrenInNavigationOrderAttribute, NSAccessibilityPrimaryScreenHeightAttribute, nil]);
</del><ins>+                            NSAccessibilityPositionAttribute, NSAccessibilitySizeAttribute, NSAccessibilityChildrenAttribute, NSAccessibilityPrimaryScreenHeightAttribute, nil]);
</ins><span class="cx">     
</span><span class="cx">     return m_attributeNames.get();
</span><span class="cx"> }
</span><span class="lines">@@ -153,11 +153,6 @@
</span><span class="cx">     return @[wrapper];
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (NSArray *)accessibilityChildrenInNavigationOrder
-{
-    return [self accessibilityChildren];
-}
-
</del><span class="cx"> ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
</span><span class="cx"> - (id)accessibilityAttributeValue:(NSString *)attribute
</span><span class="cx"> ALLOW_DEPRECATED_IMPLEMENTATIONS_END
</span><span class="lines">@@ -198,10 +193,6 @@
</span><span class="cx">     if ([attribute isEqualToString:NSAccessibilityChildrenAttribute])
</span><span class="cx">         return [self accessibilityChildren];
</span><span class="cx">     
</span><del>-    // [self accessibilityChildren] is just the root object, so it's already in navigation order.
-    if ([attribute isEqualToString:NSAccessibilityChildrenInNavigationOrderAttribute])
-        return [self accessibilityChildren];
-
</del><span class="cx">     return nil;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>