Get rid of AXComputedObjectAttributeCache

Source/core/accessibility/AXObjectCacheImpl.cpp

 /*
  * 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 70 matching lines @@
 namespace blink {
 
 using namespace HTMLNames;
 
 // static
 AXObjectCache* AXObjectCache::create(Document& document)
 {
     return new AXObjectCacheImpl(document);
 }
 
-AXObjectInclusion AXComputedObjectAttributeCache::getIgnored(AXID id) const
-{
-    HashMap<AXID, CachedAXObjectAttributes>::const_iterator it = m_idMapping.find(id);
-    return it != m_idMapping.end() ? it->value.ignored : DefaultBehavior;
-}
-
-void AXComputedObjectAttributeCache::setIgnored(AXID id, AXObjectInclusion inclusion)
-{
-    HashMap<AXID, CachedAXObjectAttributes>::iterator it = m_idMapping.find(id);
-    if (it != m_idMapping.end()) {
-        it->value.ignored = inclusion;
-    } else {
-        CachedAXObjectAttributes attributes;
-        attributes.ignored = inclusion;
-        m_idMapping.set(id, attributes);
-    }
-}
-
-void AXComputedObjectAttributeCache::clear()
-{
-    m_idMapping.clear();
-}
-
 AXObjectCacheImpl::AXObjectCacheImpl(Document& document)
     : m_document(document)
+    , m_modificationCount(0)
     , m_notificationPostTimer(this, &AXObjectCacheImpl::notificationPostTimerFired)
 {
-    m_computedObjectAttributeCache = AXComputedObjectAttributeCache::create();
 }
 
 AXObjectCacheImpl::~AXObjectCacheImpl()
 {
     m_notificationPostTimer.stop();
 
     HashMap<AXID, RefPtr<AXObject> >::iterator end = m_objects.end();
     for (HashMap<AXID, RefPtr<AXObject> >::iterator it = m_objects.begin(); it != end; ++it) {
         AXObject* obj = (*it).value.get();
         detachWrapper(obj);
@@ skipping 622 matching lines @@
     }
 
     m_notificationsToPost.clear();
 }
 
 void AXObjectCacheImpl::postNotification(RenderObject* renderer, AXNotification notification, bool postToElement, PostType postType)
 {
     if (!renderer)
         return;
 
-    m_computedObjectAttributeCache->clear();
+    m_modificationCount++;
 
     // Get an accessibility object that already exists. One should not be created here
     // because a render update may be in progress and creating an AX object can re-trigger a layout
     RefPtr<AXObject> object = get(renderer);
     while (!object && renderer) {
         renderer = renderer->parent();
         object = get(renderer);
     }
 
     if (!renderer)
         return;
 
     postNotification(object.get(), &renderer->document(), notification, postToElement, postType);
 }
 
 void AXObjectCacheImpl::postNotification(Node* node, AXNotification notification, bool postToElement, PostType postType)
 {
     if (!node)
         return;
 
-    m_computedObjectAttributeCache->clear();
+    m_modificationCount++;
 
     // Get an accessibility object that already exists. One should not be created here
     // because a render update may be in progress and creating an AX object can re-trigger a layout
     RefPtr<AXObject> object = get(node);
     while (!object && node) {
         node = node->parentNode();
         object = get(node);
     }
 
     if (!node)
         return;
 
     postNotification(object.get(), &node->document(), notification, postToElement, postType);
 }
 
 void AXObjectCacheImpl::postNotification(AXObject* object, Document* document, AXNotification notification, bool postToElement, PostType postType)
 {
-    m_computedObjectAttributeCache->clear();
+    m_modificationCount++;
 
     if (object && !postToElement)
         object = object->observableObject();
 
     if (!object && document)
         object = get(document->renderView());
 
     if (!object)
         return;
 
@@ skipping 25 matching lines @@
     postNotification(renderer, AXSelectedChildrenChanged, false);
 }
 
 void AXObjectCacheImpl::handleScrollbarUpdate(FrameView* view)
 {
     if (!view)
         return;
 
     // We don't want to create a scroll view from this method, only update an existing one.
     if (AXObject* scrollViewObject = get(view)) {
-        m_computedObjectAttributeCache->clear();
+        m_modificationCount++;
         scrollViewObject->updateChildrenIfNecessary();
     }
 }
 
 void AXObjectCacheImpl::handleLayoutComplete(RenderObject* renderer)
 {
     if (!renderer)
         return;
 
-    m_computedObjectAttributeCache->clear();
+    m_modificationCount++;
 
     // Create the AXObject if it didn't yet exist - that's always safe at the end of a layout, and it
     // allows an AX notification to be sent when a page has its first layout, rather than when the
     // document first loads.
     if (AXObject* obj = getOrCreate(renderer))
         postNotification(obj, obj->document(), AXLayoutComplete, true);
 }
 
 void AXObjectCacheImpl::handleAriaExpandedChange(Node* node)
 {
     if (AXObject* obj = getOrCreate(node))
         obj->handleAriaExpandedChanged();
 }
 
 void AXObjectCacheImpl::handleActiveDescendantChanged(Node* node)
 {
     if (AXObject* obj = getOrCreate(node))
         obj->handleActiveDescendantChanged();
 }
 
 void AXObjectCacheImpl::handleAriaRoleChanged(Node* node)
 {
     if (AXObject* obj = getOrCreate(node)) {
         obj->updateAccessibilityRole();
-        m_computedObjectAttributeCache->clear();
+        m_modificationCount++;
         obj->notifyIfIgnoredValueChanged();
     }
 }
 
 void AXObjectCacheImpl::handleAttributeChanged(const QualifiedName& attrName, Element* element)
 {
     if (attrName == roleAttr)
         handleAriaRoleChanged(element);
     else if (attrName == altAttr || attrName == titleAttr)
         textChanged(element);
@@ skipping 218 matching lines @@
 void AXObjectCacheImpl::setCanvasObjectBounds(Element* element, const LayoutRect& rect)
 {
     AXObject* obj = getOrCreate(element);
     if (!obj)
         return;
 
     obj->setElementRect(rect);
 }
 
 } // namespace blink