Changeset 257948 in webkit

Timestamp:

Mar 5, 2020 2:50:32 PM (4 years ago)

Author:

Andres Gonzalez

Message:

Fix for several failures of LayoutTests in isolated tree mode.
​https://bugs.webkit.org/show_bug.cgi?id=208658

Reviewed by Chris Fleizach.

• Exposes the scrollView method through the AXCoreObject interface so

that wrapper code can use it for both AXObjects and IsolatedObjects.

• Fix for a crash/assert where InvalidAXID cannot be passed as key to

the HashMap methods.

• accessibility/AccessibilityObject.h:
• accessibility/AccessibilityObjectInterface.h:
• accessibility/AccessibilityScrollView.h:
• accessibility/isolatedtree/AXIsolatedObject.cpp:

(WebCore::AXIsolatedObject::scrollView const):

• accessibility/isolatedtree/AXIsolatedObject.h:
• accessibility/isolatedtree/AXIsolatedTree.cpp:

(WebCore::AXIsolatedTree::applyPendingChanges):

• accessibility/mac/WebAccessibilityObjectWrapperMac.mm:

(-[WebAccessibilityObjectWrapper scrollViewParent]):
(-[WebAccessibilityObjectWrapper _accessibilityShowContextMenu]):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/AccessibilityObject.h (modified) (1 diff)
• accessibility/AccessibilityObjectInterface.h (modified) (1 diff)
• accessibility/AccessibilityScrollView.h (modified) (1 diff)
• accessibility/isolatedtree/AXIsolatedObject.cpp (modified) (1 diff)
• accessibility/isolatedtree/AXIsolatedObject.h (modified) (1 diff)
• accessibility/isolatedtree/AXIsolatedTree.cpp (modified) (2 diffs)
• accessibility/mac/WebAccessibilityObjectWrapperMac.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-03-05  Andres Gonzalez  <andresg_22@apple.com>
+
+        Fix for several failures of LayoutTests in isolated tree mode.
+        https://bugs.webkit.org/show_bug.cgi?id=208658
+
+        Reviewed by Chris Fleizach.
+
+        - Exposes the scrollView method through the AXCoreObject interface so
+        that wrapper code can use it for both AXObjects and IsolatedObjects.
+        - Fix for a crash/assert where InvalidAXID cannot be passed as key to
+        the HashMap methods.
+
+        * accessibility/AccessibilityObject.h:
+        * accessibility/AccessibilityObjectInterface.h:
+        * accessibility/AccessibilityScrollView.h:
+        * accessibility/isolatedtree/AXIsolatedObject.cpp:
+        (WebCore::AXIsolatedObject::scrollView const):
+        * accessibility/isolatedtree/AXIsolatedObject.h:
+        * accessibility/isolatedtree/AXIsolatedTree.cpp:
+        (WebCore::AXIsolatedTree::applyPendingChanges):
+        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+        (-[WebAccessibilityObjectWrapper scrollViewParent]):
+        (-[WebAccessibilityObjectWrapper _accessibilityShowContextMenu]):
+
 2020-03-05  Jacob Uphoff  <jacob_uphoff@apple.com>
 

trunk/Source/WebCore/accessibility/AccessibilityObject.h

@@ -467 +467 @@
     Frame* mainFrame() const override;
     Document* topDocument() const override;
+    ScrollView* scrollView() const override { return nullptr; }
     ScrollView* scrollViewAncestor() const override;
     String language() const override;

trunk/Source/WebCore/accessibility/AccessibilityObjectInterface.h

@@ -876 +876 @@
     virtual Frame* mainFrame() const = 0;
     virtual Document* topDocument() const = 0;
+    virtual ScrollView* scrollView() const = 0;
     virtual ScrollView* scrollViewAncestor() const = 0;
     virtual String language() const = 0;

trunk/Source/WebCore/accessibility/AccessibilityScrollView.h

@@ -38 +38 @@
     static Ref<AccessibilityScrollView> create(ScrollView*);
     AccessibilityRole roleValue() const override { return AccessibilityRole::ScrollArea; }
-    ScrollView* scrollView() const { return m_scrollView; }
+    ScrollView* scrollView() const override { return m_scrollView; }
 
     virtual ~AccessibilityScrollView();

trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp

@@ -1612 +1612 @@
 }
 
+ScrollView* AXIsolatedObject::scrollView() const
+{
+    if (auto* object = associatedAXObject())
+        return object->scrollView();
+    return nullptr;
+}
+
 ScrollView* AXIsolatedObject::scrollViewAncestor() const
 {

trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.h

@@ -828 +828 @@
     Frame* mainFrame() const override;
     Document* topDocument() const override;
+    ScrollView* scrollView() const override;
     ScrollView* scrollViewAncestor() const override;
     void childrenChanged() override;

trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp

@@ -229 +229 @@
 
     for (const auto& axID : m_pendingRemovals) {
+        if (axID == InvalidAXID)
+            continue;
+
         if (auto object = nodeForID(axID))
             object->detach(AccessibilityDetachmentType::ElementDestroyed);
@@ -237 +240 @@
     for (const auto& item : m_pendingAppends) {
         AXID axID = item.m_isolatedObject->objectID();
+        if (axID == InvalidAXID)
+            continue;
 
         if (m_readerThreadNodeMap.get(axID) != &item.m_isolatedObject.get()) {

trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm

@@ -2272 +2272 @@
 {
     return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([protectedSelf = RetainPtr<WebAccessibilityObjectWrapper>(self)] () -> RetainPtr<id> {
-        if (!is<AccessibilityScrollView>(protectedSelf.get().axBackingObject))
+        auto* backingObject = protectedSelf.get().axBackingObject;
+        if (!backingObject || !backingObject->isScrollView())
             return nil;
 
         // If this scroll view provides it's parent object (because it's a sub-frame), then
         // we should not find the remoteAccessibilityParent.
-        if (protectedSelf.get().axBackingObject->parentObject())
+        if (backingObject->parentObject())
             return nil;
 
-        ScrollView* scroll = downcast<AccessibilityScrollView>(*protectedSelf.get().axBackingObject).scrollView();
+        auto* scroll = backingObject->scrollView();
         if (!scroll)
             return nil;
@@ -3422 +3423 @@
         // Find the appropriate scroll view to use to convert the contents to the window.
         for (auto* parent = self.axBackingObject->parentObject(); parent; parent = parent->parentObject()) {
-            if (is<AccessibilityScrollView>(*parent)) {
-                if (auto scrollView = downcast<AccessibilityScrollView>(*parent).scrollView()) {
+            if (parent->isScrollView()) {
+                if (auto* scrollView = parent->scrollView()) {
                     if (!frameView->platformWidget())
                         rect = scrollView->contentsToRootView(rect);