Changeset 260448 in webkit

Timestamp:

Apr 21, 2020 1:21:04 PM (4 years ago)

Author:

Andres Gonzalez

Message:

Fix for remoteParentObject and platformWidget not being stored properly in the AXIsolatedObject attributes variant.
​https://bugs.webkit.org/show_bug.cgi?id=210809

Reviewed by Chris Fleizach.

Adding these properties to the AXIsolatedObject attributes variant as
WeakPtr<void*> fails. So they are now cached as member variables.

• accessibility/isolatedtree/AXIsolatedObject.cpp:

(WebCore::AXIsolatedObject::initializeAttributeData):
(WebCore::AXIsolatedObject::platformWidget const):

• accessibility/isolatedtree/AXIsolatedObject.h:

(WebCore::AXIsolatedObject::propertyValue const): Deleted.

• accessibility/isolatedtree/mac/AXIsolatedObjectMac.mm:

(WebCore::AXIsolatedObject::initializePlatformProperties):
(WebCore::AXIsolatedObject::remoteParentObject const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/isolatedtree/AXIsolatedObject.cpp (modified) (3 diffs)
• accessibility/isolatedtree/AXIsolatedObject.h (modified) (6 diffs)
• accessibility/isolatedtree/mac/AXIsolatedObjectMac.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-21  Andres Gonzalez  <andresg_22@apple.com>
+
+        Fix for remoteParentObject and platformWidget not being stored properly in the AXIsolatedObject attributes variant.
+        https://bugs.webkit.org/show_bug.cgi?id=210809
+
+        Reviewed by Chris Fleizach.
+
+        Adding these properties to the AXIsolatedObject attributes variant as
+        WeakPtr<void*> fails. So they are now cached as member variables.
+
+        * accessibility/isolatedtree/AXIsolatedObject.cpp:
+        (WebCore::AXIsolatedObject::initializeAttributeData):
+        (WebCore::AXIsolatedObject::platformWidget const):
+        * accessibility/isolatedtree/AXIsolatedObject.h:
+        (WebCore::AXIsolatedObject::propertyValue const): Deleted.
+        * accessibility/isolatedtree/mac/AXIsolatedObjectMac.mm:
+        (WebCore::AXIsolatedObject::initializePlatformProperties):
+        (WebCore::AXIsolatedObject::remoteParentObject const):
+
 2020-04-20  Simon Fraser  <simon.fraser@apple.com>
 

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

@@ -375 +375 @@
     }
 
-    if (object.isScrollView()) {
-#if PLATFORM(COCOA)
-        setProperty(AXPropertyName::PlatformWidget, object.platformWidget());
-        setProperty(AXPropertyName::RemoteParentObject, object.remoteParentObject());
-#else
-        setProperty(AXPropertyName::PlatformWidget, object.platformWidget());
-#endif
-    }
-
     if (isRoot) {
         setObjectProperty(AXPropertyName::WebArea, object.webAreaObject());
@@ -392 +383 @@
         setObjectVectorProperty(AXPropertyName::DocumentLinks, object.documentLinks());
     }
+
+    initializePlatformProperties(object);
 }
 
@@ -1572 +1565 @@
 }
 
+PlatformWidget AXIsolatedObject::platformWidget() const
+{
+#if PLATFORM(COCOA)
+    return m_platformWidget.get();
+#else
+    return m_platformWidget;
+#endif
+}
+
 Widget* AXIsolatedObject::widgetForAttachmentView() const
 {

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

@@ -74 +74 @@
     bool isAXIsolatedObjectInstance() const override { return true; }
     void initializeAttributeData(AXCoreObject&, bool isRoot);
+    void initializePlatformProperties(const AXCoreObject&);
     AXCoreObject* associatedAXObject() const
     {
@@ -277 +278 @@
         Orientation,
         PlaceholderValue,
-        PlatformWidget,
         PressedIsPresent,
         PopupValue,
@@ -283 +283 @@
         PreventKeyboardDOMEventDispatch,
         ReadOnlyValue,
-#if PLATFORM(COCOA)
-        RemoteParentObject,
-#endif
         RoleValue,
         RolePlatformString,
@@ -342 +339 @@
     };
 
-    using AttributeValueVariant = Variant<std::nullptr_t, String, bool, int, unsigned, double, float, uint64_t, Color, URL, LayoutRect, FloatRect, AXID, IntPoint, OptionSet<SpeakAs>, std::pair<unsigned, unsigned>, Vector<AccessibilityIsolatedTreeText>, Vector<AXID>, Vector<AccessibilityIsolatedTreeMathMultiscriptPair>, Vector<String>,
-#if PLATFORM(COCOA)
-        WeakPtr<void*> // To hold an ObjectiveC object, e.g., NSView* or id.
-#else
-        PlatformWidget
-#endif
-    >;
+    using AttributeValueVariant = Variant<std::nullptr_t, String, bool, int, unsigned, double, float, uint64_t, Color, URL, LayoutRect, FloatRect, AXID, IntPoint, OptionSet<SpeakAs>, std::pair<unsigned, unsigned>, Vector<AccessibilityIsolatedTreeText>, Vector<AXID>, Vector<AccessibilityIsolatedTreeMathMultiscriptPair>, Vector<String>>;
     void setProperty(AXPropertyName, AttributeValueVariant&&, bool shouldRemove = false);
     void setObjectProperty(AXPropertyName, AXCoreObject*);
@@ -832 +823 @@
     TextIteratorBehavior textIteratorBehaviorForTextRange() const override;
     Widget* widget() const override;
-    PlatformWidget platformWidget() const override { return propertyValue<PlatformWidget>(AXPropertyName::PlatformWidget); }
+    PlatformWidget platformWidget() const override;
 #if PLATFORM(COCOA)
     RemoteAXObjectRef remoteParentObject() const override;
@@ -911 +902 @@
 
     HashMap<AXPropertyName, AttributeValueVariant, WTF::IntHash<AXPropertyName>, WTF::StrongEnumHashTraits<AXPropertyName>> m_attributeMap;
+#if PLATFORM(COCOA)
+    RetainPtr<NSView> m_platformWidget;
+    RetainPtr<RemoteAXObjectRef> m_remoteParent;
+#else
+    PlatformWidget m_platformWidget;
+#endif
 };
 
-template<typename T>
-inline T AXIsolatedObject::propertyValue(AXPropertyName propertyName) const
-{
-    auto value = m_attributeMap.get(propertyName);
-    return WTF::switchOn(value,
-        [] (WeakPtr<T>& typedValue) { return typedValue; },
-        [] (auto&) { return nullptr; }
-    );
-}
-
 } // namespace WebCore
 

trunk/Source/WebCore/accessibility/isolatedtree/mac/AXIsolatedObjectMac.mm

@@ -33 +33 @@
 namespace WebCore {
 
+void AXIsolatedObject::initializePlatformProperties(const AXCoreObject& object)
+{
+    if (object.isScrollView()) {
+        m_platformWidget = object.platformWidget();
+        m_remoteParent = object.remoteParentObject();
+    }
+}
+
 RemoteAXObjectRef AXIsolatedObject::remoteParentObject() const
 {
@@ -38 +46 @@
         return object.isScrollView();
     });
-    return is<AXIsolatedObject>(scrollView) ? downcast<AXIsolatedObject>(scrollView)->propertyValue<RemoteAXObjectRef>(AXPropertyName::RemoteParentObject) : nil;
+    return is<AXIsolatedObject>(scrollView) ? downcast<AXIsolatedObject>(scrollView)->m_remoteParent.get() : nil;
 }