Get rid of AXComputedObjectAttributeCache

Source/core/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 34 matching lines @@
 class FrameView;
 class Widget;
 
 struct TextMarkerData {
     AXID axID;
     Node* node;
     int offset;
     EAffinity affinity;
 };
 
-class AXComputedObjectAttributeCache {
-public:
-    static PassOwnPtr<AXComputedObjectAttributeCache> create() { return adoptPtr(new AXComputedObjectAttributeCache()); }
-
-    AXObjectInclusion getIgnored(AXID) const;
-    void setIgnored(AXID, AXObjectInclusion);
-
-    void clear();
-
-private:
-    AXComputedObjectAttributeCache() { }
-
-    struct CachedAXObjectAttributes {
-        CachedAXObjectAttributes() : ignored(DefaultBehavior) { }
-
-        AXObjectInclusion ignored;
-    };
-
-    HashMap<AXID, CachedAXObjectAttributes> m_idMapping;
-};
-
 enum PostType { PostSynchronously, PostAsynchronously };
 
 // This class should only be used from inside the accessibility directory.
 class AXObjectCacheImpl : public AXObjectCache {
     WTF_MAKE_NONCOPYABLE(AXObjectCacheImpl); WTF_MAKE_FAST_ALLOCATED;
 public:
     explicit AXObjectCacheImpl(Document&);
     ~AXObjectCacheImpl();
 
     static AXObject* focusedUIElementForPage(const Page*);
@@ skipping 81 matching lines @@
     bool accessibilityEnabled();
     bool inlineTextBoxAccessibilityEnabled();
 
     void removeAXID(AXObject*);
     bool isIDinUse(AXID id) const { return m_idsInUse.contains(id); }
 
     AXID platformGenerateAXID() const;
 
     bool nodeHasRole(Node*, const AtomicString& role);
 
-    AXComputedObjectAttributeCache* computedObjectAttributeCache() { return m_computedObjectAttributeCache.get(); }
+    // 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(RenderObject*, AXNotification, bool postToElement, PostType = PostAsynchronously);
     void postNotification(Node*, AXNotification, bool postToElement, PostType = PostAsynchronously);
     void postNotification(AXObject*, Document*, AXNotification, bool postToElement, PostType = PostAsynchronously);
 
 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); }
 
 private:
     Document& m_document;
     HashMap<AXID, RefPtr<AXObject> > m_objects;
     HashMap<RenderObject*, AXID> m_renderObjectMapping;
     HashMap<Widget*, AXID> m_widgetObjectMapping;
     HashMap<Node*, AXID> m_nodeObjectMapping;
     HashMap<AbstractInlineTextBox*, AXID> m_inlineTextBoxObjectMapping;
     HashSet<Node*> m_textMarkerNodes;
-    OwnPtr<AXComputedObjectAttributeCache> m_computedObjectAttributeCache;
+    int m_modificationCount;
 
     HashSet<AXID> m_idsInUse;
 
     Timer<AXObjectCacheImpl> m_notificationPostTimer;
     Vector<pair<RefPtr<AXObject>, AXNotification> > m_notificationsToPost;
     void notificationPostTimerFired(Timer<AXObjectCacheImpl>*);
 
     static AXObject* focusedImageMapUIElement(HTMLAreaElement*);
 
     AXID getAXID(AXObject*);
 
     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