Oilpan: Prepare moving AXObject to heap

Source/modules/accessibility/AXLayoutObject.cpp

 /*
 * Copyright (C) 2008 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
@@ skipping 163 matching lines @@
 AXLayoutObject::AXLayoutObject(LayoutObject* layoutObject, AXObjectCacheImpl* axObjectCache)
     : AXNodeObject(layoutObject->node(), axObjectCache)
     , m_layoutObject(layoutObject)
     , m_cachedElementRectDirty(true)
 {
 #if ENABLE(ASSERT)
     m_layoutObject->setHasAXObject(true);
 #endif
 }
 
-PassRefPtr<AXLayoutObject> AXLayoutObject::create(LayoutObject* layoutObject, AXObjectCacheImpl* axObjectCache)
+PassRefPtrWillBeRawPtr<AXLayoutObject> AXLayoutObject::create(LayoutObject* layoutObject, AXObjectCacheImpl* axObjectCache)
 {
-    return adoptRef(new AXLayoutObject(layoutObject, axObjectCache));
+    return adoptRefWillBeNoop(new AXLayoutObject(layoutObject, axObjectCache));
 }
 
 AXLayoutObject::~AXLayoutObject()
 {
     ASSERT(isDetached());
 }
 
 LayoutRect AXLayoutObject::elementRect() const
 {
     if (!m_explicitElementRect.isEmpty())
@@ skipping 1489 matching lines @@
 {
     // If the need to add more children in addition to existing children arises,
     // childrenChanged should have been called, leaving the object with no children.
     ASSERT(!m_haveChildren);
 
     m_haveChildren = true;
 
     if (!canHaveChildren())
         return;
 
-    for (RefPtr<AXObject> obj = firstChild(); obj; obj = obj->nextSibling())
+    for (RefPtrWillBeRawPtr<AXObject> obj = firstChild(); obj; obj = obj->nextSibling())
         addChild(obj.get());
 
     addHiddenChildren();
     addAttachmentChildren();
     addPopupChildren();
     addImageMapChildren();
     addTextFieldChildren();
     addCanvasChildren();
     addRemoteSVGChildren();
     addInlineTextBoxChildren(false);
@@ skipping 634 matching lines @@
     if (!map)
         return;
 
     for (HTMLAreaElement& area : Traversal<HTMLAreaElement>::descendantsOf(*map)) {
         // add an <area> element for this child if it has a link
         if (area.isLink()) {
             AXImageMapLink* areaObject = toAXImageMapLink(axObjectCache()->getOrCreate(ImageMapLinkRole));
             areaObject->setHTMLAreaElement(&area);
             areaObject->setHTMLMapElement(map);
             areaObject->setParent(this);
-            if (!areaObject->accessibilityIsIgnored())
+            if (!areaObject->accessibilityIsIgnored()) {
                 m_children.append(areaObject);
-            else
+            } else {
+#if ENABLE(OILPAN)
+                axObjectCache()->remove(areaObject);
+#else
                 axObjectCache()->remove(areaObject->axObjectID());
+#endif
+            }
         }
     }
 }
 
 void AXLayoutObject::addCanvasChildren()
 {
     if (!isHTMLCanvasElement(node()))
         return;
 
     // If it's a canvas, it won't have laid out children, but it might have accessible fallback content.
@@ skipping 123 matching lines @@
         if (label && label->layoutObject()) {
             LayoutRect labelRect = axObjectCache()->getOrCreate(label)->elementRect();
             result.unite(labelRect);
         }
     }
 
     return result;
 }
 
 } // namespace blink