Title: [219799] releases/WebKitGTK/webkit-2.16
Revision
219799
Author
[email protected]
Date
2017-07-24 02:40:39 -0700 (Mon, 24 Jul 2017)

Log Message

Merge r216726 - AX: Defer text changes until after the tree is clean if needed.
https://bugs.webkit.org/show_bug.cgi?id=171546
<rdar://problem/31934942>

Reviewed by Simon Fraser.

Source/WebCore:

While updating an accessibility object state, we might
trigger unintentional style updates. This style update could
end up destroying renderes that are still referenced by functions
on the callstack.
To avoid that, defer such changes and let AXObjectCache operate on a clean tree.

Test: accessibility/crash-when-render-tree-is-not-clean.html

* accessibility/AXObjectCache.cpp:
(WebCore::AXObjectCache::remove):
(WebCore::AXObjectCache::handleAttributeChanged):
(WebCore::AXObjectCache::labelChanged):
(WebCore::AXObjectCache::performDeferredCacheUpdate):
(WebCore::AXObjectCache::deferRecomputeIsIgnored):
(WebCore::AXObjectCache::deferTextChangedIfNeeded):
(WebCore::AXObjectCache::recomputeDeferredIsIgnored): Deleted.
(WebCore::AXObjectCache::deferTextChanged): Deleted.
* accessibility/AXObjectCache.h: Decouple different type of changes.
(WebCore::AXObjectCache::deferRecomputeIsIgnored):
(WebCore::AXObjectCache::deferTextChangedIfNeeded):
(WebCore::AXObjectCache::recomputeDeferredIsIgnored): Deleted.
(WebCore::AXObjectCache::deferTextChanged): Deleted.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::deleteLines):
* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlockFlow::createAndAppendRootInlineBox):
* rendering/RenderText.cpp:
(WebCore::RenderText::setText):

LayoutTests:

* accessibility/crash-when-render-tree-is-not-clean-expected.txt: Added.
* accessibility/crash-when-render-tree-is-not-clean.html: Added.

Modified Paths

Added Paths

Diff

Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog (219798 => 219799)


--- releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog	2017-07-24 08:58:51 UTC (rev 219798)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog	2017-07-24 09:40:39 UTC (rev 219799)
@@ -1,3 +1,14 @@
+2017-05-11  Zalan Bujtas  <[email protected]>
+
+        AX: Defer text changes until after the tree is clean if needed.
+        https://bugs.webkit.org/show_bug.cgi?id=171546
+        <rdar://problem/31934942>
+
+        Reviewed by Simon Fraser.
+
+        * accessibility/crash-when-render-tree-is-not-clean-expected.txt: Added.
+        * accessibility/crash-when-render-tree-is-not-clean.html: Added.
+
 2017-05-02  Zalan Bujtas  <[email protected]>
 
         Defer AX cache update when text content changes until after layout is finished.

Added: releases/WebKitGTK/webkit-2.16/LayoutTests/accessibility/crash-when-render-tree-is-not-clean-expected.txt (0 => 219799)


--- releases/WebKitGTK/webkit-2.16/LayoutTests/accessibility/crash-when-render-tree-is-not-clean-expected.txt	                        (rev 0)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/accessibility/crash-when-render-tree-is-not-clean-expected.txt	2017-07-24 09:40:39 UTC (rev 219799)
@@ -0,0 +1,2 @@
+Pass if no crash or assert.
+

Added: releases/WebKitGTK/webkit-2.16/LayoutTests/accessibility/crash-when-render-tree-is-not-clean.html (0 => 219799)


--- releases/WebKitGTK/webkit-2.16/LayoutTests/accessibility/crash-when-render-tree-is-not-clean.html	                        (rev 0)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/accessibility/crash-when-render-tree-is-not-clean.html	2017-07-24 09:40:39 UTC (rev 219799)
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we properly update the tree before updating accessibility cache.</title>
+<script>
+if (window.accessibilityController)
+    accessibilityController.accessibleElementById("outer");
+if (window.testRunner)
+    testRunner.dumpAsText();
+</script>
+</head>
+<body>
+Pass if no crash or assert.
+<div id=outer><div id=inner>foobar</div></div>
+<script>
+  inner.style.display = "none";
+  outer.setAttribute("aria-labeledby", "inner");
+</script>
+</body>
+</html>

Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (219798 => 219799)


--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog	2017-07-24 08:58:51 UTC (rev 219798)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog	2017-07-24 09:40:39 UTC (rev 219799)
@@ -1,3 +1,40 @@
+2017-05-11  Zalan Bujtas  <[email protected]>
+
+        AX: Defer text changes until after the tree is clean if needed.
+        https://bugs.webkit.org/show_bug.cgi?id=171546
+        <rdar://problem/31934942>
+
+        Reviewed by Simon Fraser.
+
+        While updating an accessibility object state, we might
+        trigger unintentional style updates. This style update could
+        end up destroying renderes that are still referenced by functions
+        on the callstack.
+        To avoid that, defer such changes and let AXObjectCache operate on a clean tree.         
+
+        Test: accessibility/crash-when-render-tree-is-not-clean.html
+
+        * accessibility/AXObjectCache.cpp:
+        (WebCore::AXObjectCache::remove):
+        (WebCore::AXObjectCache::handleAttributeChanged):
+        (WebCore::AXObjectCache::labelChanged):
+        (WebCore::AXObjectCache::performDeferredCacheUpdate):
+        (WebCore::AXObjectCache::deferRecomputeIsIgnored):
+        (WebCore::AXObjectCache::deferTextChangedIfNeeded):
+        (WebCore::AXObjectCache::recomputeDeferredIsIgnored): Deleted.
+        (WebCore::AXObjectCache::deferTextChanged): Deleted.
+        * accessibility/AXObjectCache.h: Decouple different type of changes.
+        (WebCore::AXObjectCache::deferRecomputeIsIgnored):
+        (WebCore::AXObjectCache::deferTextChangedIfNeeded):
+        (WebCore::AXObjectCache::recomputeDeferredIsIgnored): Deleted.
+        (WebCore::AXObjectCache::deferTextChanged): Deleted.
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::deleteLines):
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlockFlow::createAndAppendRootInlineBox):
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::setText):
+
 2017-05-02  Zalan Bujtas  <[email protected]>
 
         Defer AX cache update when text content changes until after layout is finished.

Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/accessibility/AXObjectCache.cpp (219798 => 219799)


--- releases/WebKitGTK/webkit-2.16/Source/WebCore/accessibility/AXObjectCache.cpp	2017-07-24 08:58:51 UTC (rev 219798)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/accessibility/AXObjectCache.cpp	2017-07-24 09:40:39 UTC (rev 219799)
@@ -711,7 +711,6 @@
     AXID axID = m_renderObjectMapping.get(renderer);
     remove(axID);
     m_renderObjectMapping.remove(renderer);
-    m_deferredCacheUpdateList.remove(renderer);
 }
 
 void AXObjectCache::remove(Node* node)
@@ -719,6 +718,9 @@
     if (!node)
         return;
 
+    if (is<Element>(*node))
+        m_deferredRecomputeIsIgnoredList.remove(downcast<Element>(node));
+    m_deferredTextChangedList.remove(node);
     removeNodeForUse(node);
 
     // This is all safe even if we didn't have a mapping.
@@ -1429,7 +1431,7 @@
     if (attrName == roleAttr)
         handleAriaRoleChanged(element);
     else if (attrName == altAttr || attrName == titleAttr)
-        textChanged(element);
+        deferTextChangedIfNeeded(element);
     else if (attrName == forAttr && is<HTMLLabelElement>(*element))
         labelChanged(element);
 
@@ -1443,7 +1445,7 @@
     else if (attrName == aria_valuenowAttr || attrName == aria_valuetextAttr)
         postNotification(element, AXObjectCache::AXValueChanged);
     else if (attrName == aria_labelAttr || attrName == aria_labeledbyAttr || attrName == aria_labelledbyAttr)
-        textChanged(element);
+        deferTextChangedIfNeeded(element);
     else if (attrName == aria_checkedAttr)
         checkedStateChanged(element);
     else if (attrName == aria_selectedAttr)
@@ -1489,7 +1491,7 @@
 {
     ASSERT(is<HTMLLabelElement>(*element));
     HTMLElement* correspondingControl = downcast<HTMLLabelElement>(*element).control();
-    textChanged(correspondingControl);
+    deferTextChangedIfNeeded(correspondingControl);
 }
 
 void AXObjectCache::recomputeIsIgnored(RenderObject* renderer)
@@ -2676,29 +2678,43 @@
     
 void AXObjectCache::performDeferredCacheUpdate()
 {
-    for (auto* renderer : m_deferredCacheUpdateList) {
-        if (is<RenderBlock>(*renderer))
+    for (auto* node : m_deferredTextChangedList)
+        textChanged(node);
+    m_deferredTextChangedList.clear();
+
+    for (auto* element : m_deferredRecomputeIsIgnoredList) {
+        if (auto* renderer = element->renderer())
             recomputeIsIgnored(renderer);
-        else if (is<RenderText>(*renderer))
-            textChanged(renderer);
-        else
-            ASSERT_NOT_REACHED();
     }
-    m_deferredCacheUpdateList.clear();
+    m_deferredRecomputeIsIgnoredList.clear();
 }
 
-void AXObjectCache::recomputeDeferredIsIgnored(RenderBlock& renderer)
+void AXObjectCache::deferRecomputeIsIgnored(Element* element)
 {
-    if (renderer.beingDestroyed())
+    if (!element)
         return;
-    m_deferredCacheUpdateList.add(&renderer);
+
+    if (element->renderer() && element->renderer()->beingDestroyed())
+        return;
+
+    m_deferredRecomputeIsIgnoredList.add(element);
 }
 
-void AXObjectCache::deferTextChanged(RenderText& renderer)
+void AXObjectCache::deferTextChangedIfNeeded(Node* node)
 {
-    if (renderer.beingDestroyed())
+    if (!node)
         return;
-    m_deferredCacheUpdateList.add(&renderer);
+
+    if (node->renderer() && node->renderer()->beingDestroyed())
+        return;
+
+    auto& document = node->document();
+    // FIXME: We should just defer all text changes.
+    if (document.needsStyleRecalc() || document.inRenderTreeUpdate() || (document.view() && document.view()->isInRenderTreeLayout())) {
+        m_deferredTextChangedList.add(node);
+        return;
+    }
+    textChanged(node);
 }
 
 bool isNodeAriaVisible(Node* node)

Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/accessibility/AXObjectCache.h (219798 => 219799)


--- releases/WebKitGTK/webkit-2.16/Source/WebCore/accessibility/AXObjectCache.h	2017-07-24 08:58:51 UTC (rev 219798)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/accessibility/AXObjectCache.h	2017-07-24 09:40:39 UTC (rev 219799)
@@ -326,8 +326,8 @@
 #if PLATFORM(MAC)
     static void setShouldRepostNotificationsForTests(bool value);
 #endif
-    void recomputeDeferredIsIgnored(RenderBlock& renderer);
-    void deferTextChanged(RenderText& renderer);
+    void deferRecomputeIsIgnored(Element*);
+    void deferTextChangedIfNeeded(Node*);
     void performDeferredCacheUpdate();
 
 protected:
@@ -430,7 +430,8 @@
 
     AXTextStateChangeIntent m_textSelectionIntent;
     bool m_isSynchronizingSelection { false };
-    ListHashSet<RenderObject*> m_deferredCacheUpdateList;
+    ListHashSet<Element*> m_deferredRecomputeIsIgnoredList;
+    ListHashSet<Node*> m_deferredTextChangedList;
 };
 
 class AXAttributeCacheEnabler
@@ -492,8 +493,8 @@
 inline void AXObjectCache::handleScrollbarUpdate(ScrollView*) { }
 inline void AXObjectCache::handleAttributeChanged(const QualifiedName&, Element*) { }
 inline void AXObjectCache::recomputeIsIgnored(RenderObject*) { }
-inline void AXObjectCache::recomputeDeferredIsIgnored(RenderBlock&) { }
-inline void AXObjectCache::deferTextChanged(RenderText&) { }
+inline void AXObjectCache::deferRecomputeIsIgnored(Element*) { }
+inline void AXObjectCache::deferTextChangedIfNeeded(Node*) { }
 inline void AXObjectCache::performDeferredCacheUpdate() { }
 inline void AXObjectCache::handleScrolledToAnchor(const Node*) { }
 inline void AXObjectCache::postTextStateChangeNotification(Node*, const AXTextStateChangeIntent&, const VisibleSelection&) { }

Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderBlock.cpp (219798 => 219799)


--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderBlock.cpp	2017-07-24 08:58:51 UTC (rev 219798)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderBlock.cpp	2017-07-24 09:40:39 UTC (rev 219799)
@@ -681,7 +681,7 @@
 void RenderBlock::deleteLines()
 {
     if (AXObjectCache* cache = document().existingAXObjectCache())
-        cache->recomputeDeferredIsIgnored(*this);
+        cache->deferRecomputeIsIgnored(element());
 }
 
 void RenderBlock::makeChildrenNonInline(RenderObject* insertionPoint)

Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderBlockLineLayout.cpp (219798 => 219799)


--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderBlockLineLayout.cpp	2017-07-24 08:58:51 UTC (rev 219798)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderBlockLineLayout.cpp	2017-07-24 09:40:39 UTC (rev 219799)
@@ -130,7 +130,7 @@
 
     if (UNLIKELY(AXObjectCache::accessibilityEnabled()) && firstRootBox() == rootBox) {
         if (AXObjectCache* cache = document().existingAXObjectCache())
-            cache->recomputeDeferredIsIgnored(*this);
+            cache->deferRecomputeIsIgnored(element());
     }
 
     return rootBox;

Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderText.cpp (219798 => 219799)


--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderText.cpp	2017-07-24 08:58:51 UTC (rev 219798)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderText.cpp	2017-07-24 09:40:39 UTC (rev 219799)
@@ -1283,7 +1283,7 @@
         downcast<RenderBlockFlow>(*parent()).invalidateLineLayoutPath();
     
     if (AXObjectCache* cache = document().existingAXObjectCache())
-        cache->deferTextChanged(*this);
+        cache->deferTextChangedIfNeeded(textNode());
 }
 
 String RenderText::textWithoutConvertingBackslashToYenSymbol() const
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to