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 120 matching lines @@
     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*);
 
+#if ENABLE(OILPAN)
+    void remove(AXObject*);
+#else
     void remove(AXID);
+#endif
     void remove(AbstractInlineTextBox*);
 
     void childrenChanged(AXObject*);
 
     void handleActiveDescendantChanged(Node*);
     void handleAriaRoleChanged(Node*);
     void handleAriaExpandedChange(Node*);
     void handleAriaSelectedChanged(Node*);
 
     void recomputeIsIgnored(LayoutObject*);
 
     bool accessibilityEnabled();
     bool inlineTextBoxAccessibilityEnabled();
 
+#if !ENABLE(OILPAN)
     void removeAXID(AXObject*);
+#endif
     bool isIDinUse(AXID id) const { return m_idsInUse.contains(id); }
 
     AXID platformGenerateAXID() const;
 
     // Counts the number of times the document has been modified. Some attribute values are cached
     // as long as the modification count hasn't changed.
     int modificationCount() const { return m_modificationCount; }
 
     void postNotification(LayoutObject*, AXNotification);
     void postNotification(Node*, AXNotification);
     void postNotification(AXObject*, AXNotification);
 
 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:
+    void removeAXID(AXID);
+
     Document& m_document;

[haraken, 2015/05/28 10:48:41]

This should be Member<Document>.

[keishi, 2015/06/08 06:27:21]

Done.

+
+#if ENABLE(OILPAN)
+    HeapHashMap<AXID, WeakMember<AXObject>> m_objects;

[haraken, 2015/05/28 10:48:41]

Why isn't this a HeapHashMap<AXID, Member<AXObject>>? It seems strange that you
change RefPtr to WeakMember.

[keishi, 2015/06/08 06:27:21]

Done.

+    HeapHashMap<LayoutObject*, Member<AXObject>> m_layoutObjectMapping;
+    HeapHashMap<WeakMember<Widget>, Member<AXObject>> m_widgetObjectMapping;
+    HeapHashMap<WeakMember<Node>, Member<AXObject>> m_nodeObjectMapping;
+    HeapHashMap<AbstractInlineTextBox*, Member<AXObject>> m_inlineTextBoxObjectMapping;
+#else
     HashMap<AXID, RefPtr<AXObject>> m_objects;
     HashMap<LayoutObject*, AXID> m_layoutObjectMapping;
     HashMap<Widget*, AXID> m_widgetObjectMapping;
     HashMap<Node*, AXID> m_nodeObjectMapping;
     HashMap<AbstractInlineTextBox*, AXID> m_inlineTextBoxObjectMapping;

[haraken, 2015/05/28 10:48:41]

It is a bit unfortunate (and makes it harder to verify correctness) that we have
to use different types of collections between oilpan and non-oilpan. Would it be
possible to refactor non-oilpan code so that it uses the same types of
collections as oilpan (before landing this CL)? Or would it be hard for some
reason?

[keishi, 2015/06/08 06:27:21]

Done.

-    HashSet<Node*> m_textMarkerNodes;
+#endif
+    WillBeHeapHashSet<RawPtrWillBeWeakMember<Node>> m_textMarkerNodes;
     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