Oilpan: Prepare moving AXObject to heap

Source/modules/accessibility/AXLayoutObject.cpp

Index: Source/modules/accessibility/AXLayoutObject.cpp
diff --git a/Source/modules/accessibility/AXLayoutObject.cpp b/Source/modules/accessibility/AXLayoutObject.cpp
index ab927d81109ce7fab78e6af1625c7091a83b73f8..2e6a49ec1df2cca5e675b09283889ccd76a98c24 100644
--- a/Source/modules/accessibility/AXLayoutObject.cpp
+++ b/Source/modules/accessibility/AXLayoutObject.cpp
@@ -177,9 +177,9 @@ AXLayoutObject::AXLayoutObject(LayoutObject* layoutObject, AXObjectCacheImpl* ax
 #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()
@@ -1470,7 +1470,7 @@ void AXLayoutObject::addChildren()
     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();
@@ -2136,10 +2136,15 @@ void AXLayoutObject::addImageMapChildren()
             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
+            }
         }
     }
 }