Refactor: Clear m_axObjectCache when AXObject detaches

Source/modules/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 257 matching lines @@
 
 PassRefPtr<AXObject> AXObjectCacheImpl::createFromRenderer(LayoutObject* layoutObject)
 {
     // FIXME: How could layoutObject->node() ever not be an Element?
     Node* node = layoutObject->node();
 
     // If the node is aria role="list" or the aria role is empty and its a
     // ul/ol/dl type (it shouldn't be a list if aria says otherwise).
     if (nodeHasRole(node, "list") || nodeHasRole(node, "directory")
         || (nodeHasRole(node, nullAtom) && (isHTMLUListElement(node) || isHTMLOListElement(node) || isHTMLDListElement(node))))
-        return AXList::create(layoutObject, this);
+        return AXList::create(layoutObject, *this);
 
     // aria tables
     if (nodeHasRole(node, "grid") || nodeHasRole(node, "treegrid"))
-        return AXARIAGrid::create(layoutObject, this);
+        return AXARIAGrid::create(layoutObject, *this);
     if (nodeHasRole(node, "row"))
-        return AXARIAGridRow::create(layoutObject, this);
+        return AXARIAGridRow::create(layoutObject, *this);
     if (nodeHasRole(node, "gridcell") || nodeHasRole(node, "columnheader") || nodeHasRole(node, "rowheader"))
-        return AXARIAGridCell::create(layoutObject, this);
+        return AXARIAGridCell::create(layoutObject, *this);
 
     // media controls
     if (node && node->isMediaControlElement())
-        return AccessibilityMediaControl::create(layoutObject, this);
+        return AccessibilityMediaControl::create(layoutObject, *this);
 
     if (isHTMLOptionElement(node))
-        return AXListBoxOption::create(layoutObject, this);
+        return AXListBoxOption::create(layoutObject, *this);
 
     if (layoutObject->isSVGRoot())
-        return AXSVGRoot::create(layoutObject, this);
+        return AXSVGRoot::create(layoutObject, *this);
 
     if (layoutObject->isBoxModelObject()) {
         LayoutBoxModelObject* cssBox = toLayoutBoxModelObject(layoutObject);
         if (cssBox->isListBox())
-            return AXListBox::create(toLayoutListBox(cssBox), this);
+            return AXListBox::create(toLayoutListBox(cssBox), *this);
         if (cssBox->isMenuList())
-            return AXMenuList::create(toLayoutMenuList(cssBox), this);
+            return AXMenuList::create(toLayoutMenuList(cssBox), *this);
 
         // standard tables
         if (cssBox->isTable())
-            return AXTable::create(toLayoutTable(cssBox), this);
+            return AXTable::create(toLayoutTable(cssBox), *this);
         if (cssBox->isTableRow())
-            return AXTableRow::create(toLayoutTableRow(cssBox), this);
+            return AXTableRow::create(toLayoutTableRow(cssBox), *this);
         if (cssBox->isTableCell())
-            return AXTableCell::create(toLayoutTableCell(cssBox), this);
+            return AXTableCell::create(toLayoutTableCell(cssBox), *this);
 
         // progress bar
         if (cssBox->isProgress())
-            return AXProgressIndicator::create(toLayoutProgress(cssBox), this);
+            return AXProgressIndicator::create(toLayoutProgress(cssBox), *this);
 
         // input type=range
         if (cssBox->isSlider())
-            return AXSlider::create(toLayoutSlider(cssBox), this);
+            return AXSlider::create(toLayoutSlider(cssBox), *this);
     }
 
-    return AXLayoutObject::create(layoutObject, this);
+    return AXLayoutObject::create(layoutObject, *this);
 }
 
 PassRefPtr<AXObject> AXObjectCacheImpl::createFromNode(Node* node)
 {
     if (isMenuListOption(node))
-        return AXMenuListOption::create(toHTMLOptionElement(node), this);
+        return AXMenuListOption::create(toHTMLOptionElement(node), *this);
 
-    return AXNodeObject::create(node, this);
+    return AXNodeObject::create(node, *this);
 }
 
 PassRefPtr<AXObject> AXObjectCacheImpl::createFromInlineTextBox(AbstractInlineTextBox* inlineTextBox)
 {
-    return AXInlineTextBox::create(inlineTextBox, this);
+    return AXInlineTextBox::create(inlineTextBox, *this);
 }
 
 AXObject* AXObjectCacheImpl::getOrCreate(Widget* widget)
 {
     if (!widget)
         return 0;
 
     if (AXObject* obj = get(widget))
         return obj;
 
     RefPtr<AXObject> newObj = nullptr;
     if (widget->isFrameView()) {
         FrameView* frameView = toFrameView(widget);
 
         // Don't create an AXScrollView for a FrameView that isn't attached to a frame,
         // for example if it's in the process of being disposed.
         if (frameView->frame().view() != frameView || !frameView->layoutView())
             return 0;
 
-        newObj = AXScrollView::create(toFrameView(widget), this);
-    } else if (widget->isScrollbar())
-        newObj = AXScrollbar::create(toScrollbar(widget), this);
+        newObj = AXScrollView::create(toFrameView(widget), *this);
+    } else if (widget->isScrollbar()) {
+        newObj = AXScrollbar::create(toScrollbar(widget), *this);
+    }
 
     // Will crash later if we have two objects for the same widget.
     ASSERT(!get(widget));
 
     // Catch the case if an (unsupported) widget type is used. Only FrameView and ScrollBar are supported now.
     ASSERT(newObj);
     if (!newObj)
         return 0;
 
     getAXID(newObj.get());
@@ skipping 93 matching lines @@
     return getOrCreate(m_document.view());
 }
 
 AXObject* AXObjectCacheImpl::getOrCreate(AccessibilityRole role)
 {
     RefPtr<AXObject> obj = nullptr;
 
     // will be filled in...
     switch (role) {
     case ImageMapLinkRole:
-        obj = AXImageMapLink::create(this);
+        obj = AXImageMapLink::create(*this);
         break;
     case ColumnRole:
-        obj = AXTableColumn::create(this);
+        obj = AXTableColumn::create(*this);
         break;
     case TableHeaderContainerRole:
-        obj = AXTableHeaderContainer::create(this);
+        obj = AXTableHeaderContainer::create(*this);
         break;
     case SliderThumbRole:
-        obj = AXSliderThumb::create(this);
+        obj = AXSliderThumb::create(*this);
         break;
     case MenuListPopupRole:
-        obj = AXMenuListPopup::create(this);
+        obj = AXMenuListPopup::create(*this);
         break;
     case SpinButtonRole:
-        obj = AXSpinButton::create(this);
+        obj = AXSpinButton::create(*this);
         break;
     case SpinButtonPartRole:
-        obj = AXSpinButtonPart::create(this);
+        obj = AXSpinButtonPart::create(*this);
         break;
     default:
         obj = nullptr;
     }
 
     if (obj)
         getAXID(obj.get());
     else
         return 0;
 
@@ skipping 205 matching lines @@
 
     m_notificationPostTimer.stop();
 
     unsigned i = 0, count = m_notificationsToPost.size();
     for (i = 0; i < count; ++i) {
         AXObject* obj = m_notificationsToPost[i].first.get();
 
         if (!obj->axObjectID())
             continue;
 
-        if (!obj->axObjectCache())
+        if (obj->isDetached())
             continue;
 
 #if ENABLE(ASSERT)
         // Make sure none of the layout views are in the process of being layed out.
         // Notifications should only be sent after the layoutObject has finished
         if (obj->isAXLayoutObject()) {
             AXLayoutObject* layoutObj = toAXLayoutObject(obj);
             LayoutObject* layoutObject = layoutObj->layoutObject();
             if (layoutObject && layoutObject->view())
                 ASSERT(!layoutObject->view()->layoutState());
@@ skipping 621 matching lines @@
 void AXObjectCacheImpl::setCanvasObjectBounds(Element* element, const LayoutRect& rect)
 {
     AXObject* obj = getOrCreate(element);
     if (!obj)
         return;
 
     obj->setElementRect(rect);
 }
 
 } // namespace blink