One AXObjectCache per frame

third_party/WebKit/Source/modules/accessibility/AXObjectCacheImpl.h

Index: third_party/WebKit/Source/modules/accessibility/AXObjectCacheImpl.h
diff --git a/third_party/WebKit/Source/modules/accessibility/AXObjectCacheImpl.h b/third_party/WebKit/Source/modules/accessibility/AXObjectCacheImpl.h
index 8185a2cdf31ade1186f11de79306009931982242..8c9fa06258ecf56498c161e0ffa9b7741e43c7cc 100644
--- a/third_party/WebKit/Source/modules/accessibility/AXObjectCacheImpl.h
+++ b/third_party/WebKit/Source/modules/accessibility/AXObjectCacheImpl.h
@@ -43,7 +43,6 @@ namespace blink {
 class AbstractInlineTextBox;
 class HTMLAreaElement;
 class FrameView;
-class Widget;
 
 // This class should only be used from inside the accessibility directory.
 class MODULES_EXPORT AXObjectCacheImpl : public AXObjectCache {
@@ -55,8 +54,6 @@ public:
     ~AXObjectCacheImpl();
     DECLARE_VIRTUAL_TRACE();
 
-    AXObject* focusedUIElementForPage(const Page*);
-
     void dispose() override;
 
     void selectionChanged(Node*) override;
@@ -69,7 +66,6 @@ public:
 
     void remove(LayoutObject*) override;
     void remove(Node*) override;
-    void remove(Widget*) override;
     void remove(AbstractInlineTextBox*) override;
 
     const Element* rootAXEditableElement(const Node*) override;
@@ -99,8 +95,6 @@ public:
     void handleScrollPositionChanged(FrameView*) override;
     void handleScrollPositionChanged(LayoutObject*) override;
 
-    // Called when scroll bars are added / removed (as the view resizes).
-    void handleScrollbarUpdate(FrameView*) override;
     void handleLayoutComplete(LayoutObject*) override;
     void handleScrolledToAnchor(const Node* anchorNode) override;
 
@@ -116,14 +110,12 @@ public:
     // used for objects without backing elements
     AXObject* getOrCreate(AccessibilityRole);
     AXObject* getOrCreate(LayoutObject*);
-    AXObject* getOrCreate(Widget*);
     AXObject* getOrCreate(Node*);
     AXObject* getOrCreate(AbstractInlineTextBox*);
 
     // will only return the AXObject if it already exists
     AXObject* get(Node*);
     AXObject* get(LayoutObject*);
-    AXObject* get(Widget*);
     AXObject* get(AbstractInlineTextBox*);
 
     AXObject* firstAccessibleObjectFromNode(const Node*);
@@ -196,7 +188,6 @@ private:
     // LayoutObject and AbstractInlineTextBox are not on the Oilpan heap so we
     // do not use HeapHashMap for those mappings.
     HashMap<LayoutObject*, AXID> m_layoutObjectMapping;
-    WillBeHeapHashMap<RawPtrWillBeMember<Widget>, AXID> m_widgetObjectMapping;
     WillBeHeapHashMap<RawPtrWillBeMember<Node>, AXID> m_nodeObjectMapping;
     HashMap<AbstractInlineTextBox*, AXID> m_inlineTextBoxObjectMapping;
     int m_modificationCount;