Oilpan: Prepare moving AXObject to heap

Source/core/layout/line/AbstractInlineTextBox.cpp

 /*
  * Copyright (C) 2013 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/layout/line/AbstractInlineTextBox.h"
 
+#include "core/dom/AXObjectCache.h"
 #include "core/editing/iterators/TextIterator.h"
 #include "platform/text/TextBreakIterator.h"
 
 namespace blink {
 
 AbstractInlineTextBox::InlineToAbstractInlineTextBoxHashMap* AbstractInlineTextBox::gAbstractInlineTextBoxMap = nullptr;
 
 PassRefPtr<AbstractInlineTextBox> AbstractInlineTextBox::getOrCreate(LayoutText* layoutText, InlineTextBox* inlineTextBox)
 {
     if (!inlineTextBox)
@@ skipping 16 matching lines @@
     if (!gAbstractInlineTextBoxMap)
         return;
 
     InlineToAbstractInlineTextBoxHashMap::const_iterator it = gAbstractInlineTextBoxMap->find(inlineTextBox);
     if (it != gAbstractInlineTextBoxMap->end()) {
         it->value->detach();
         gAbstractInlineTextBoxMap->remove(inlineTextBox);
     }
 }
 
 void AbstractInlineTextBox::detach()

[haraken, 2015/06/24 23:37:34]

Add an ASSERT to ~AbstractInlineTextBox to verify that the detach has been
called before it gets destructed.

[keishi, 2015/06/25 03:29:27]

Done.

 {
+    if (Node* node = m_layoutText->node()) {
+        if (AXObjectCache* cache = node->document().existingAXObjectCache())
+            cache->remove(this);
+    }
+
     m_layoutText = 0;
     m_inlineTextBox = 0;
 }
 
 PassRefPtr<AbstractInlineTextBox> AbstractInlineTextBox::nextInlineTextBox() const
 {
     ASSERT(!m_inlineTextBox || !m_inlineTextBox->layoutObject().needsLayout());
     if (!m_inlineTextBox)
         return nullptr;
 
@@ skipping 109 matching lines @@
         return nullptr;
 
     InlineBox* previous = m_inlineTextBox->prevOnLine();
     if (previous && previous->isInlineTextBox())
         return getOrCreate(&toInlineTextBox(previous)->layoutObject(), toInlineTextBox(previous));
 
     return nullptr;
 }
 
 } // namespace blink