Oilpan: Prepare moving AXObject to heap

Source/modules/accessibility/AXObjectCacheImpl.h

 /*
  * Copyright (C) 2014, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 60 matching lines @@
     virtual void childrenChanged(Node*) override;
     virtual void childrenChanged(LayoutObject*) override;
     virtual void checkedStateChanged(Node*) override;
     virtual void listboxOptionStateChanged(HTMLOptionElement*);
     virtual void listboxSelectedChildrenChanged(HTMLSelectElement*);
     virtual void listboxActiveIndexChanged(HTMLSelectElement*);
 
     virtual void remove(LayoutObject*) override;
     virtual void remove(Node*) override;
     virtual void remove(Widget*) override;
+    virtual void remove(AbstractInlineTextBox*) override;
 
     virtual const Element* rootAXEditableElement(const Node*) override;
 
     // Called by a node when text or a text equivalent (e.g. alt) attribute is changed.
     virtual void textChanged(LayoutObject*) override;
     // Called when a node has just been attached, so we can make sure we have the right subclass of AXObject.
     virtual void updateCacheAfterNodeIsAttached(Node*) override;
 
     virtual void handleAttributeChanged(const QualifiedName& attrName, Element*) override;
     virtual void handleFocusedUIElementChanged(Node* oldFocusedNode, Node* newFocusedNode) override;
     virtual void handleInitialFocus() override;
     virtual void handleTextFormControlChanged(Node*) override;
     virtual void handleEditableTextContentChanged(Node*) override;
     virtual void handleValueChanged(Node*) override;
     virtual void handleUpdateActiveMenuOption(LayoutMenuList*, int optionIndex) override;
     virtual void didShowMenuListPopup(LayoutMenuList*) override;
     virtual void didHideMenuListPopup(LayoutMenuList*) override;
     virtual void handleLoadComplete(Document*) override;
     virtual void handleLayoutComplete(Document*) override;
 
     virtual void setCanvasObjectBounds(Element*, const LayoutRect&) override;
 
-    virtual void clearWeakMembers(Visitor*) override;
-
     virtual void inlineTextBoxesUpdated(LayoutObject*) override;
 
     // Called when the scroll offset changes.
     virtual void handleScrollPositionChanged(FrameView*) override;
     virtual 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;
@@ skipping 16 matching lines @@
 
     // 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*);
 
     void remove(AXID);
-    void remove(AbstractInlineTextBox*);
 
     void childrenChanged(AXObject*);
 
     void handleActiveDescendantChanged(Node*);
     void handleAriaRoleChanged(Node*);
     void handleAriaExpandedChange(Node*);
     void handleAriaSelectedChanged(Node*);
 
     void recomputeIsIgnored(LayoutObject*);
 
@@ skipping 41 matching lines @@
 protected:
     void postPlatformNotification(AXObject*, AXNotification);
     void textChanged(AXObject*);
     void labelChanged(Element*);
 
     // This is a weak reference cache for knowing if Nodes used by TextMarkers are valid.
     void setNodeInUse(Node* n) { m_textMarkerNodes.add(n); }
     void removeNodeForUse(Node* n) { m_textMarkerNodes.remove(n); }
     bool isNodeInUse(Node* n) { return m_textMarkerNodes.contains(n); }
 
-    PassRefPtr<AXObject> createFromRenderer(LayoutObject*);
-    PassRefPtr<AXObject> createFromNode(Node*);
-    PassRefPtr<AXObject> createFromInlineTextBox(AbstractInlineTextBox*);
+    PassRefPtrWillBeRawPtr<AXObject> createFromRenderer(LayoutObject*);
+    PassRefPtrWillBeRawPtr<AXObject> createFromNode(Node*);
+    PassRefPtrWillBeRawPtr<AXObject> createFromInlineTextBox(AbstractInlineTextBox*);
 
 private:
-    Document& m_document;
-    HashMap<AXID, RefPtr<AXObject>> m_objects;
+
+    RawPtrWillBeMember<Document> m_document;
+    WillBeHeapHashMap<AXID, RefPtrWillBeMember<AXObject>> m_objects;
+    // LayoutObject and AbstractInlineTextBox are not on the Oilpan heap so we
+    // do not use HeapHashMap for those mappings.
     HashMap<LayoutObject*, AXID> m_layoutObjectMapping;
-    HashMap<Widget*, AXID> m_widgetObjectMapping;
-    HashMap<Node*, AXID> m_nodeObjectMapping;
+    WillBeHeapHashMap<RawPtrWillBeMember<Widget>, AXID> m_widgetObjectMapping;
+    WillBeHeapHashMap<RawPtrWillBeMember<Node>, AXID> m_nodeObjectMapping;
     HashMap<AbstractInlineTextBox*, AXID> m_inlineTextBoxObjectMapping;
-    HashSet<Node*> m_textMarkerNodes;
+    WillBeHeapHashSet<RawPtrWillBeWeakMember<Node>> m_textMarkerNodes;

[haraken, 2015/06/24 13:27:20]

I think this can be a Member as well, since the lifetime of m_textMarkerNodes is
explicitly managed.

[keishi, 2015/06/24 15:05:26]

Done. Just noticed I can't find setNodeInUse used anywhere. I think this might
be dead code.

     int m_modificationCount;
 
     HashSet<AXID> m_idsInUse;
 
 #if ENABLE(ASSERT)
     // Verified when finalizing.
     bool m_hasBeenDisposed;
 #endif
 
     //
@@ skipping 17 matching lines @@
     // exist in the tree.
     HashMap<AXID, HashSet<String>> m_ariaOwnerToIdsMapping;
 
     // Map from an ID (the ID attribute of a DOM element) to the set of elements that
     // want to own that ID. This is *unvalidated*, it includes possible duplicates.
     // This is used so that when an element with an ID is added to the tree or changes
     // its ID, we can quickly determine if it affects an aria-owns relationship.
     HashMap<String, OwnPtr<HashSet<AXID>>> m_idToAriaOwnersMapping;
 
     Timer<AXObjectCacheImpl> m_notificationPostTimer;
-    Vector<pair<RefPtr<AXObject>, AXNotification>> m_notificationsToPost;
+    WillBeHeapVector<pair<RefPtrWillBeMember<AXObject>, AXNotification>> m_notificationsToPost;
     void notificationPostTimerFired(Timer<AXObjectCacheImpl>*);
 
     AXObject* focusedImageMapUIElement(HTMLAreaElement*);
 
     AXID getAXID(AXObject*);
 
     void textChanged(Node*);
     bool nodeIsTextControl(const Node*);
 
     Settings* settings();
 };
 
 // This is the only subclass of AXObjectCache.
 DEFINE_TYPE_CASTS(AXObjectCacheImpl, AXObjectCache, cache, true, true);
 
 bool nodeHasRole(Node*, const String& role);
 // This will let you know if aria-hidden was explicitly set to false.
 bool isNodeAriaVisible(Node*);
 
 }
 
 #endif