Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(969)

Unified Diff: Source/modules/accessibility/AXLayoutObject.cpp

Issue 1072273006: Oilpan: Prepare moving AXObject to heap (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/modules/accessibility/AXLayoutObject.h ('k') | Source/modules/accessibility/AXList.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/accessibility/AXLayoutObject.cpp
diff --git a/Source/modules/accessibility/AXLayoutObject.cpp b/Source/modules/accessibility/AXLayoutObject.cpp
index 1d0564acb34df125560efc3e34a5c7654acad84e..bcfecc9af2dbb233e2bf3dd62f09581d0b4fefbc 100644
--- a/Source/modules/accessibility/AXLayoutObject.cpp
+++ b/Source/modules/accessibility/AXLayoutObject.cpp
@@ -181,9 +181,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()
@@ -1707,7 +1707,7 @@ void AXLayoutObject::addChildren()
Vector<AXObject*> ownedChildren;
computeAriaOwnsChildren(ownedChildren);
- for (RefPtr<AXObject> obj = firstChild(); obj; obj = obj->nextSibling()) {
+ for (RefPtrWillBeRawPtr<AXObject> obj = firstChild(); obj; obj = obj->nextSibling()) {
if (!axObjectCache().isAriaOwned(obj.get()))
addChild(obj.get());
}
@@ -2367,6 +2367,7 @@ void AXLayoutObject::addImageMapChildren()
areaObject->setHTMLAreaElement(&area);
areaObject->setHTMLMapElement(map);
areaObject->setParent(this);
+ ASSERT(areaObject->axObjectID() != 0);
if (!areaObject->accessibilityIsIgnored())
m_children.append(areaObject);
else
« no previous file with comments | « Source/modules/accessibility/AXLayoutObject.h ('k') | Source/modules/accessibility/AXList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698