Refactor: Clear m_axObjectCache when AXObject detaches

Source/modules/accessibility/AXMenuListPopup.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 16 matching lines @@
 #include "modules/accessibility/AXMenuListPopup.h"
 
 #include "core/html/HTMLSelectElement.h"
 #include "modules/accessibility/AXMenuListOption.h"
 #include "modules/accessibility/AXObjectCacheImpl.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
-AXMenuListPopup::AXMenuListPopup(AXObjectCacheImpl* axObjectCache)
+AXMenuListPopup::AXMenuListPopup(AXObjectCacheImpl& axObjectCache)
     : AXMockObject(axObjectCache), m_activeIndex(-1)
 {
 }
 
 bool AXMenuListPopup::isVisible() const
 {
     return !isOffScreen();
 }
 
 bool AXMenuListPopup::isOffScreen() const
@@ skipping 16 matching lines @@
 {
     return accessibilityIsIgnoredByDefault(ignoredReasons);
 }
 
 AXMenuListOption* AXMenuListPopup::menuListOptionAXObject(HTMLElement* element) const
 {
     ASSERT(element);
     if (!isHTMLOptionElement(*element))
         return 0;
 
-    AXObject* object = axObjectCache()->getOrCreate(element);
+    AXObject* object = axObjectCache().getOrCreate(element);
     if (!object || !object->isMenuListOption())
         return 0;
 
     return toAXMenuListOption(object);
 }
 
 int AXMenuListPopup::getSelectedIndex() const
 {
     if (!m_parent)
         return -1;
@@ skipping 47 matching lines @@
         clearChildren();
 
     if (!m_haveChildren)
         addChildren();
 }
 
 void AXMenuListPopup::didUpdateActiveOption(int optionIndex)
 {
     updateChildrenIfNecessary();
 
-    AXObjectCacheImpl* cache = axObjectCache();
+    AXObjectCacheImpl& cache = axObjectCache();
     if (m_activeIndex != optionIndex && m_activeIndex >= 0 && m_activeIndex < static_cast<int>(m_children.size())) {
         RefPtr<AXObject> previousChild = m_children[m_activeIndex].get();
-        cache->postNotification(previousChild.get(), AXObjectCacheImpl::AXMenuListItemUnselected);
+        cache.postNotification(previousChild.get(), AXObjectCacheImpl::AXMenuListItemUnselected);
     }
 
     if (optionIndex >= 0 && optionIndex < static_cast<int>(m_children.size())) {
         RefPtr<AXObject> child = m_children[optionIndex].get();
-        cache->postNotification(child.get(), AXObjectCacheImpl::AXFocusedUIElementChanged);
-        cache->postNotification(child.get(), AXObjectCacheImpl::AXMenuListItemSelected);
+        cache.postNotification(child.get(), AXObjectCacheImpl::AXFocusedUIElementChanged);
+        cache.postNotification(child.get(), AXObjectCacheImpl::AXMenuListItemSelected);
     }
 
     m_activeIndex = optionIndex;
 }
 
 void AXMenuListPopup::didHide()
 {
-    AXObjectCacheImpl* cache = axObjectCache();
-    cache->postNotification(this, AXObjectCacheImpl::AXHide);
+    AXObjectCacheImpl& cache = axObjectCache();
+    cache.postNotification(this, AXObjectCacheImpl::AXHide);
     if (activeChild())
-        cache->postNotification(activeChild(), AXObjectCacheImpl::AXMenuListItemUnselected);
+        cache.postNotification(activeChild(), AXObjectCacheImpl::AXMenuListItemUnselected);
 }
 
 void AXMenuListPopup::didShow()
 {
     if (!m_haveChildren)
         addChildren();
 
-    AXObjectCacheImpl* cache = axObjectCache();
-    cache->postNotification(this, AXObjectCacheImpl::AXShow);
+    AXObjectCacheImpl& cache = axObjectCache();
+    cache.postNotification(this, AXObjectCacheImpl::AXShow);
     int selectedIndex = getSelectedIndex();
     if (selectedIndex >= 0 && selectedIndex < static_cast<int>(m_children.size()))
         didUpdateActiveOption(selectedIndex);
     else
-        cache->postNotification(m_parent, AXObjectCacheImpl::AXFocusedUIElementChanged);
+        cache.postNotification(m_parent, AXObjectCacheImpl::AXFocusedUIElementChanged);
 }
 
 AXObject* AXMenuListPopup::activeChild()
 {
     if (m_activeIndex < 0 || m_activeIndex >= static_cast<int>(children().size()))
         return nullptr;
 
     return m_children[m_activeIndex].get();
 }
 
 } // namespace blink