Refactor: Clear m_axObjectCache when AXObject detaches

Source/modules/accessibility/AXMenuList.cpp

 /*
  * Copyright (C) 2010 Apple 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 14 matching lines @@
 
 #include "config.h"
 #include "modules/accessibility/AXMenuList.h"
 
 #include "core/layout/LayoutMenuList.h"
 #include "modules/accessibility/AXMenuListPopup.h"
 #include "modules/accessibility/AXObjectCacheImpl.h"
 
 namespace blink {
 
-AXMenuList::AXMenuList(LayoutMenuList* layoutObject, AXObjectCacheImpl* axObjectCache)
+AXMenuList::AXMenuList(LayoutMenuList* layoutObject, AXObjectCacheImpl& axObjectCache)
     : AXLayoutObject(layoutObject, axObjectCache)
 {
 }
 
-PassRefPtr<AXMenuList> AXMenuList::create(LayoutMenuList* layoutObject, AXObjectCacheImpl* axObjectCache)
+PassRefPtr<AXMenuList> AXMenuList::create(LayoutMenuList* layoutObject, AXObjectCacheImpl& axObjectCache)
 {
     return adoptRef(new AXMenuList(layoutObject, axObjectCache));
 }
 
 AccessibilityRole AXMenuList::determineAccessibilityRole()
 {
     if ((m_ariaRole = determineAriaRoleAttribute()) != UnknownRole)
         return m_ariaRole;
 
     return PopUpButtonRole;
@@ skipping 22 matching lines @@
     // so call it on our popup.
     ASSERT(m_children.size() == 1);
     m_children[0]->clearChildren();
     m_childrenDirty = false;
 }
 
 void AXMenuList::addChildren()
 {
     m_haveChildren = true;
 
-    AXObjectCacheImpl* cache = axObjectCache();
+    AXObjectCacheImpl& cache = axObjectCache();
 
-    AXObject* list = cache->getOrCreate(MenuListPopupRole);
+    AXObject* list = cache.getOrCreate(MenuListPopupRole);
     if (!list)
         return;
 
     toAXMockObject(list)->setParent(this);
     if (list->accessibilityIsIgnored()) {
-        cache->remove(list->axObjectID());
+        cache.remove(list->axObjectID());
         return;
     }
 
     m_children.append(list);
 
     list->addChildren();
 }
 
 bool AXMenuList::isCollapsed() const
 {
@@ skipping 27 matching lines @@
     if (!childObjects.isEmpty()) {
         ASSERT(childObjects.size() == 1);
         ASSERT(childObjects[0]->isMenuListPopup());
 
         if (childObjects[0]->isMenuListPopup()) {
             if (AXMenuListPopup* popup = toAXMenuListPopup(childObjects[0].get()))
                 popup->didUpdateActiveOption(optionIndex);
         }
     }
 
-    axObjectCache()->postNotification(this, AXObjectCacheImpl::AXMenuListValueChanged);
+    axObjectCache().postNotification(this, AXObjectCacheImpl::AXMenuListValueChanged);
 }
 
 void AXMenuList::didShowPopup()
 {
     if (children().size() != 1)
         return;
 
     AXMenuListPopup* popup = toAXMenuListPopup(children()[0].get());
     popup->didShow();
 }
 
 void AXMenuList::didHidePopup()
 {
     if (children().size() != 1)
         return;
 
     AXMenuListPopup* popup = toAXMenuListPopup(children()[0].get());
     popup->didHide();
 
     if (node() && node()->focused())
-        axObjectCache()->postNotification(this, AXObjectCacheImpl::AXFocusedUIElementChanged);
+        axObjectCache().postNotification(this, AXObjectCacheImpl::AXFocusedUIElementChanged);
 }
 
 } // namespace blink