Changeset 222612 in webkit

Timestamp:

Sep 28, 2017 9:31:56 AM (7 years ago)

Author:

Alan Bujtas

Message:

AX: Defer RenderListBox selectionChanged event until after layout is done.
​https://bugs.webkit.org/show_bug.cgi?id=177589
<rdar://problem/34705785>

Reviewed by Chris Fleizach.

Defer AX update when the selection changed event is followed by a layout.

Covered by existing tests.

• accessibility/AXObjectCache.cpp:

(WebCore::AXObjectCache::remove):
(WebCore::AXObjectCache::performDeferredCacheUpdate):
(WebCore::AXObjectCache::deferSelectedChildrenChangedIfNeeded):

• accessibility/AXObjectCache.h:

(WebCore::AXObjectCache::deferSelectedChildrenChangedIfNeeded):

• rendering/RenderListBox.cpp:

(WebCore::RenderListBox::selectionChanged):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/AXObjectCache.cpp (modified) (3 diffs)
• accessibility/AXObjectCache.h (modified) (3 diffs)
• rendering/RenderListBox.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-09-28  Zalan Bujtas  <zalan@apple.com>
+
+        AX: Defer RenderListBox selectionChanged event until after layout is done.
+        https://bugs.webkit.org/show_bug.cgi?id=177589
+        <rdar://problem/34705785>
+
+        Reviewed by Chris Fleizach.
+
+        Defer AX update when the selection changed event is followed by a layout.
+
+        Covered by existing tests.
+
+        * accessibility/AXObjectCache.cpp:
+        (WebCore::AXObjectCache::remove):
+        (WebCore::AXObjectCache::performDeferredCacheUpdate):
+        (WebCore::AXObjectCache::deferSelectedChildrenChangedIfNeeded):
+        * accessibility/AXObjectCache.h:
+        (WebCore::AXObjectCache::deferSelectedChildrenChangedIfNeeded):
+        * rendering/RenderListBox.cpp:
+        (WebCore::RenderListBox::selectionChanged):
+
 2017-09-28  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebCore/accessibility/AXObjectCache.cpp

@@ -720 +720 @@
         return;
 
-    if (is<Element>(*node))
+    if (is<Element>(*node)) {
         m_deferredRecomputeIsIgnoredList.remove(downcast<Element>(node));
+        m_deferredSelectedChildredChangedList.remove(downcast<Element>(node));
+    }
     m_deferredTextChangedList.remove(node);
     removeNodeForUse(node);
@@ -2782 +2784 @@
     }
     m_deferredRecomputeIsIgnoredList.clear();
+    
+    for (auto* selectElement : m_deferredSelectedChildredChangedList)
+        selectedChildrenChanged(selectElement);
+    m_deferredSelectedChildredChangedList.clear();
 }
 
@@ -2832 +2838 @@
     }
     textChanged(node);
+}
+
+void AXObjectCache::deferSelectedChildrenChangedIfNeeded(Element& selectElement)
+{
+    auto* renderer = selectElement.renderer();
+    if (renderer && renderer->beingDestroyed())
+        return;
+    
+    if (renderer && rendererNeedsDeferredUpdate(*renderer)) {
+        m_deferredSelectedChildredChangedList.add(&selectElement);
+        return;
+    }
+    selectedChildrenChanged(&selectElement);
 }
 

trunk/Source/WebCore/accessibility/AXObjectCache.h

@@ -333 +333 @@
     void deferRecomputeIsIgnored(Element*);
     void deferTextChangedIfNeeded(Node*);
+    void deferSelectedChildrenChangedIfNeeded(Element&);
     void performDeferredCacheUpdate();
     
@@ -440 +441 @@
     ListHashSet<Element*> m_deferredRecomputeIsIgnoredList;
     ListHashSet<Node*> m_deferredTextChangedList;
+    ListHashSet<Element*> m_deferredSelectedChildredChangedList;
     bool m_isSynchronizingSelection { false };
     bool m_performingDeferredCacheUpdate { false };
@@ -491 +493 @@
 inline void AXObjectCache::deferRecomputeIsIgnored(Element*) { }
 inline void AXObjectCache::deferTextChangedIfNeeded(Node*) { }
+inline void AXObjectCache::deferSelectedChildrenChangedIfNeeded(Element&) { }
 inline void AXObjectCache::detachWrapper(AccessibilityObject*, AccessibilityDetachmentType) { }
 inline void AXObjectCache::focusAriaModalNodeTimerFired() { }

trunk/Source/WebCore/rendering/RenderListBox.cpp

@@ -163 +163 @@
     
     if (AXObjectCache* cache = document().existingAXObjectCache())
-        cache->selectedChildrenChanged(this);
+        cache->deferSelectedChildrenChangedIfNeeded(selectElement());
 }