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

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

Issue 1213203002: Move AXObjectCache::remove so it is after ContainerNode::detach 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/AXInlineTextBox.cpp ('k') | Source/modules/accessibility/AXMenuList.cpp » ('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 035cedc08aba8d7f9a781657f0474b85ed540ae9..20061bd29f55dc09c7eafa8492443d3ceba7cc53 100644
--- a/Source/modules/accessibility/AXLayoutObject.cpp
+++ b/Source/modules/accessibility/AXLayoutObject.cpp
@@ -1244,7 +1244,7 @@ bool AXLayoutObject::ariaRoleHasPresentationalChildren() const
AXObject* AXLayoutObject::ancestorForWhichThisIsAPresentationalChild() const
{
// Walk the parent chain looking for a parent that has presentational children
- AXObject* parent = parentObject();
+ AXObject* parent = parentObjectIfExists();
while (parent) {
if (parent->ariaRoleHasPresentationalChildren())
break;
@@ -1582,6 +1582,7 @@ AXObject* AXLayoutObject::elementAccessibilityHitTest(const IntPoint& point) con
AXObject* AXLayoutObject::computeParent() const
{
+ ASSERT(!isDetached());
if (!m_layoutObject)
return 0;
@@ -1695,6 +1696,7 @@ AXObject* AXLayoutObject::nextSibling() const
void AXLayoutObject::addChildren()
{
+ ASSERT(!isDetached());
// 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);
« no previous file with comments | « Source/modules/accessibility/AXInlineTextBox.cpp ('k') | Source/modules/accessibility/AXMenuList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698