Changeset 222790 in webkit

Timestamp:

Oct 3, 2017 11:24:44 AM (7 years ago)

Author:

Alan Bujtas

Message:

[AX] Do not trigger redundant layout on tables.
​https://bugs.webkit.org/show_bug.cgi?id=177781
<rdar://problem/34777030>

Reviewed by Antti Koivisto.

Source/WebCore:

RenderTable::forceSectionsRecalc() marks the RenderTable dirty and schedules a layout.
Every time AccessibilityTable asks for the table element (including during construction),
we end up triggering a layout. This call was added (r191357) to ensure RenderTable's m_firstBody is always
up-to-date (in case of anonymous wrapper table renderer). Instead of relying on the m_firstBody,
let's just use the first child to find the table element. The first child always points to a valid
renderer (or nullptr), while m_firstBody is the result of section computation.

Covered by existing tests.

• accessibility/AccessibilityTable.cpp:

(WebCore::AccessibilityTable::tableElement const):

LayoutTests:

• TestExpectations: see webkit.org/b/177799

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityTable.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-10-03  Zalan Bujtas  <zalan@apple.com>
+
+        [AX] Do not trigger redundant layout on tables.
+        https://bugs.webkit.org/show_bug.cgi?id=177781
+        <rdar://problem/34777030>
+
+        Reviewed by Antti Koivisto.
+
+        * TestExpectations: see webkit.org/b/177799
+
 2017-10-03  Daniel Bates  <dabates@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -1509 +1509 @@
 imported/w3c/web-platform-tests/css/css-pseudo-4/first-letter-002.html [ ImageOnlyFailure ]
 imported/w3c/web-platform-tests/css/css-pseudo-4/first-letter-003.html [ ImageOnlyFailure ]
+
+webkit.org/b/177799 accessibility/table-detection.html [ Pass Failure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-03  Zalan Bujtas  <zalan@apple.com>
+
+        [AX] Do not trigger redundant layout on tables.
+        https://bugs.webkit.org/show_bug.cgi?id=177781
+        <rdar://problem/34777030>
+
+        Reviewed by Antti Koivisto.
+
+        RenderTable::forceSectionsRecalc() marks the RenderTable dirty and schedules a layout.
+        Every time AccessibilityTable asks for the table element (including during construction),
+        we end up triggering a layout. This call was added (r191357) to ensure RenderTable's m_firstBody is always
+        up-to-date (in case of anonymous wrapper table renderer). Instead of relying on the m_firstBody,
+        let's just use the first child to find the table element. The first child always points to a valid
+        renderer (or nullptr), while m_firstBody is the result of section computation.
+
+        Covered by existing tests.
+
+        * accessibility/AccessibilityTable.cpp:
+        (WebCore::AccessibilityTable::tableElement const):
+
 2017-10-03  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/accessibility/AccessibilityTable.cpp

@@ -101 +101 @@
     if (is<HTMLTableElement>(table.element()))
         return downcast<HTMLTableElement>(table.element());
-    
-    table.forceSectionsRecalc();
-
-    // If the table has a display:table-row-group, then the RenderTable does not have a pointer to it's HTMLTableElement.
-    // We can instead find it by asking the firstSection for its parent.
-    RenderTableSection* firstBody = table.firstBody();
-    if (!firstBody || !firstBody->element())
+    // Try to find the table element, when the AccessibilityTable is mapped to an anonymous table renderer.
+    auto* firstChild = table.firstChild();
+    if (!firstChild || !firstChild->node())
         return nullptr;
-    
-    return ancestorsOfType<HTMLTableElement>(*(firstBody->element())).first();
+    if (is<HTMLTableElement>(*firstChild->node()))
+        return downcast<HTMLTableElement>(firstChild->node());
+    // FIXME: This might find an unrelated parent table element.
+    return ancestorsOfType<HTMLTableElement>(*(firstChild->node())).first();
 }