Title: [268532] branches/safari-610-branch/Source/WebKit
Revision
268532
Author
[email protected]
Date
2020-10-15 11:07:42 -0700 (Thu, 15 Oct 2020)

Log Message

Cherry-pick r268246. rdar://problem/70321627

    AX: Website Warning page is inaccessible
    https://bugs.webkit.org/show_bug.cgi?id=217489

    Reviewed by Zalan Bujtas.

    If we have a safe browsing window, we need to use that instead of the content view.

    * UIProcess/Cocoa/WKSafeBrowsingWarning.h:
    * UIProcess/Cocoa/WebViewImpl.mm:
    (WebKit::WebViewImpl::accessibilityAttributeValue):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268246 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-610-branch/Source/WebKit/ChangeLog (268531 => 268532)


--- branches/safari-610-branch/Source/WebKit/ChangeLog	2020-10-15 17:37:30 UTC (rev 268531)
+++ branches/safari-610-branch/Source/WebKit/ChangeLog	2020-10-15 18:07:42 UTC (rev 268532)
@@ -1,3 +1,34 @@
+2020-10-15  Russell Epstein  <[email protected]>
+
+        Cherry-pick r268246. rdar://problem/70321627
+
+    AX: Website Warning page is inaccessible
+    https://bugs.webkit.org/show_bug.cgi?id=217489
+    
+    Reviewed by Zalan Bujtas.
+    
+    If we have a safe browsing window, we need to use that instead of the content view.
+    
+    * UIProcess/Cocoa/WKSafeBrowsingWarning.h:
+    * UIProcess/Cocoa/WebViewImpl.mm:
+    (WebKit::WebViewImpl::accessibilityAttributeValue):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268246 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-10-08  Chris Fleizach  <[email protected]>
+
+            AX: Website Warning page is inaccessible
+            https://bugs.webkit.org/show_bug.cgi?id=217489
+
+            Reviewed by Zalan Bujtas.
+
+            If we have a safe browsing window, we need to use that instead of the content view.
+
+            * UIProcess/Cocoa/WKSafeBrowsingWarning.h:
+            * UIProcess/Cocoa/WebViewImpl.mm:
+            (WebKit::WebViewImpl::accessibilityAttributeValue):
+
 2020-10-14  Russell Epstein  <[email protected]>
 
         Cherry-pick r267203. rdar://problem/70310545

Modified: branches/safari-610-branch/Source/WebKit/UIProcess/Cocoa/WKSafeBrowsingWarning.h (268531 => 268532)


--- branches/safari-610-branch/Source/WebKit/UIProcess/Cocoa/WKSafeBrowsingWarning.h	2020-10-15 17:37:30 UTC (rev 268531)
+++ branches/safari-610-branch/Source/WebKit/UIProcess/Cocoa/WKSafeBrowsingWarning.h	2020-10-15 18:07:42 UTC (rev 268532)
@@ -61,7 +61,7 @@
 @end
 
 #if PLATFORM(MAC)
-@interface WKSafeBrowsingWarning : WKSafeBrowsingBox<NSTextViewDelegate>
+@interface WKSafeBrowsingWarning : WKSafeBrowsingBox<NSTextViewDelegate, NSAccessibilityGroup>
 #else
 @interface WKSafeBrowsingWarning : UIScrollView<UITextViewDelegate>
 #endif

Modified: branches/safari-610-branch/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm (268531 => 268532)


--- branches/safari-610-branch/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm	2020-10-15 17:37:30 UTC (rev 268531)
+++ branches/safari-610-branch/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm	2020-10-15 18:07:42 UTC (rev 268532)
@@ -3687,7 +3687,9 @@
     if ([attribute isEqualToString:NSAccessibilityChildrenAttribute]) {
 
         id child = nil;
-        if (m_remoteAccessibilityChild)
+        if (m_safeBrowsingWarning)
+            child = m_safeBrowsingWarning.get();
+        else if (m_remoteAccessibilityChild)
             child = m_remoteAccessibilityChild.get();
 
             if (!child)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to