AX: AXIsolatedTree should hold a WeakPtr to the AXObjectCache.

AndresGonzalezApple · AndresGonzalezApple · commit 49d32a5281e1 · 2023-01-25T17:11:28.000-08:00
https://bugs.webkit.org/show_bug.cgi?id=251151 <rdar://problem/104645083> Reviewed by Chris Fleizach. Replaced the raw pointer to AXObjectCache with a WeakPtr. Audited that we are checking for null everywhere we access this instance variable. * Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.h: (WebCore::AXIsolatedTree::axObjectCache const): Canonical link: https://commits.webkit.org/259398@main
diff --git a/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.h b/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.h
@@ -359,7 +359,7 @@ class AXIsolatedTree : public ThreadSafeRefCounted<AXIsolatedTree>
     void queueRemovalsAndUnresolvedChanges(Vector<AXID>&&);
 
     unsigned m_maxTreeDepth { 0 };
-    AXObjectCache* m_axObjectCache { nullptr };
+    WeakPtr<AXObjectCache> m_axObjectCache;
     bool m_usedOnAXThread { true };
 
     // Stores the parent ID and children IDS for a given IsolatedObject.
@@ -407,7 +407,7 @@ class AXIsolatedTree : public ThreadSafeRefCounted<AXIsolatedTree>
 inline AXObjectCache* AXIsolatedTree::axObjectCache() const
 {
     ASSERT(isMainThread());
-    return m_axObjectCache;
+    return m_axObjectCache.get();
 }
 
 inline RefPtr<AXIsolatedTree> AXIsolatedTree::treeForPageID(std::optional<PageIdentifier> pageID)

Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,7 @@ class AXIsolatedTree : public ThreadSafeRefCounted<AXIsolatedTree>`
`359`	`359`	`void queueRemovalsAndUnresolvedChanges(Vector<AXID>&&);` 9303
`360`	`360`
`361`	`361`	`unsigned m_maxTreeDepth { 0 };`
`362`		`- AXObjectCache* m_axObjectCache { nullptr };`
	`362`	`+ WeakPtr<AXObjectCache> m_axObjectCache;`
`363`	`363`	`bool m_usedOnAXThread { true };`
`364`	`364`
`365`	`365`	`// Stores the parent ID and children IDS for a given IsolatedObject.`
`@@ -407,7 +407,7 @@ class AXIsolatedTree : public ThreadSafeRefCounted<AXIsolatedTree>`
`407`	`407`	`inline AXObjectCache* AXIsolatedTree::axObjectCache() const`
`408`	`408`	`{`
`409`	`409`	`ASSERT(isMainThread());`
`410`		`- return m_axObjectCache;`
	`410`	`+ return m_axObjectCache.get();`
`411`	`411`	`}`
`412`	`412`
`413`	`413`	`inline RefPtr<AXIsolatedTree> AXIsolatedTree::treeForPageID(std::optional<PageIdentifier> pageID)`