Changeset 268206 in webkit

Timestamp:

Oct 8, 2020 1:20:09 PM (4 years ago)

Author:

Andres Gonzalez

Message:

Presidential Executive Order pages not accessible with Safari.
​https://bugs.webkit.org/show_bug.cgi?id=217415
<rdar://problem/69922416>

Reviewed by Chris Fleizach and Simon Fraser.

Follow up to the previous change for this bug per Simon Fraser's comment.
Check not only the visibility and opacity of the object in question but
also of its ancestors.
Expanded the test accessibility/aria-modal.html to include the case
where the visibility of the modal dialog is determined by the opacity of
its parent object.

• accessibility/AXObjectCache.cpp:

(WebCore::AXObjectCache::isNodeVisible const):

Location:

trunk

Files:

• LayoutTests/accessibility/aria-modal-expected.txt (modified) (2 diffs)
• LayoutTests/accessibility/aria-modal.html (modified) (3 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AXObjectCache.cpp (modified) (2 diffs)

trunk/LayoutTests/accessibility/aria-modal-expected.txt

@@ -23 +23 @@
 Dialog is displaying with opacity 1
 PASS backgroundAccessible() is false
+Dialog is not displaying with parent opacity 0
+PASS backgroundAccessible() is true
+Dialog is displaying with parent opacity .5
+PASS backgroundAccessible() is false
 Dialog is removed from DOM
 PASS backgroundAccessible() is true
@@ -31 +35 @@
 
 Display a dialog
+
+

trunk/LayoutTests/accessibility/aria-modal.html

@@ -13 +13 @@
 </div>
 
-<div role="dialog" aria-modal="true" aria-labelledby="myDialog" id="box" class="box-hidden" tabindex="-1">
-    <h3 id="myDialog">Just an example.</h3>
-    <button id="ok" onclick="toggleDialog('hide');" class="close-button">OK</button>
-    <button onclick="toggleDialog('hide');" class="close-button">Cancel</button>
+<div id="dialogParent" role="group">
+    <div role="dialog" aria-modal="true" aria-labelledby="myDialog" id="box" class="box-hidden" tabindex="-1">
+        <h3 id="myDialog">Just an example.</h3>
+        <button id="ok" onclick="toggleDialog('hide');" class="close-button">OK</button>
+        <button onclick="toggleDialog('hide');" class="close-button">Cancel</button>
+    </div>
 </div>
 
@@ -98 +100 @@
             shouldBeFalse("backgroundAccessible()");
 
+            // Set opacity of the dialog parent to 0 which should make the dialog invisible since opacity multiply.
+            document.getElementById("dialogParent").style.opacity = 0;
+            await waitFor(() => {
+                return backgroundAccessible();
+            });
+            debug("Dialog is not displaying with parent opacity 0");
+            shouldBeTrue("backgroundAccessible()");
+
+            // Set opacity of the dialog parent to .5 which should make the dialog visible again.
+            document.getElementById("dialogParent").style.opacity = .5;
+            await waitFor(() => {
+                return !backgroundAccessible();
+            });
+            debug("Dialog is displaying with parent opacity .5");
+            shouldBeFalse("backgroundAccessible()");
+
             // Test modal dialog is removed from DOM tree.
             var dialog = document.getElementById("box");
@@ -129 +147 @@
         } else {
             dialog.style.display = 'none';
-            //dialog.style.opacity = 0;
             dialog.setAttribute("aria-modal", "false");
         }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-08  Andres Gonzalez  <andresg_22@apple.com>
+
+        Presidential Executive Order pages not accessible with Safari.
+        https://bugs.webkit.org/show_bug.cgi?id=217415
+        <rdar://problem/69922416>
+
+        Reviewed by Chris Fleizach and Simon Fraser.
+
+        Follow up to the previous change for this bug per Simon Fraser's comment.
+        Check not only the visibility and opacity of the object in question but
+        also of its ancestors.
+        Expanded the test accessibility/aria-modal.html to include the case
+        where the visibility of the modal dialog is determined by the opacity of
+        its parent object.
+
+        * accessibility/AXObjectCache.cpp:
+        (WebCore::AXObjectCache::isNodeVisible const):
+
 2020-10-08  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/accessibility/AXObjectCache.cpp

@@ -89 +89 @@
 #include "Range.h"
 #include "RenderAttachment.h"
+#include "RenderLayer.h"
 #include "RenderLineBreak.h"
 #include "RenderListBox.h"
@@ -301 +302 @@
         return false;
 
-    const RenderStyle& style = renderer->style();
-    if (style.display() == DisplayType::None
-        || style.visibility() != Visibility::Visible
-        || !style.opacity())
+    const auto& style = renderer->style();
+    if (style.display() == DisplayType::None)
         return false;
+
+    auto* renderLayer = renderer->enclosingLayer();
+    if (style.visibility() != Visibility::Visible && renderLayer && !renderLayer->hasVisibleContent())
+        return false;
+
+    // Check whether this object or any of its ancestors has opacity 0.
+    // The resulting opacity of a RenderObject is computed as the multiplication
+    // of its opacity times the opacities of its ancestors.
+    for (auto* renderObject = renderer; renderObject; renderObject = renderObject->parent()) {
+        if (!renderObject->style().opacity())
+            return false;
+    }
 
     // We also need to consider aria hidden status.