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

Unified Diff: Source/WebCore/accessibility/AccessibilityRenderObject.cpp

Issue 10543038: Merge 118213 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 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/WebCore/accessibility/AccessibilityObject.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/accessibility/AccessibilityRenderObject.cpp
===================================================================
--- Source/WebCore/accessibility/AccessibilityRenderObject.cpp (revision 119625)
+++ Source/WebCore/accessibility/AccessibilityRenderObject.cpp (working copy)
@@ -3428,8 +3428,14 @@
if (parent->supportsARIALiveRegion())
cache->postNotification(renderParent, AXObjectCache::AXLiveRegionChanged, true);
- if (parent->isARIATextControl() && !parent->isNativeTextControl() && !parent->node()->isContentEditable())
+ if (parent->isARIATextControl() && !parent->isNativeTextControl() && !parent->node()->isContentEditable()) {
+ // isContentEditable() might trigger a layout update and invalidate the parent.
+ ASSERT(!parent->renderer() || parent->renderer() == renderParent);
+ if (parent->isDetached())
+ break;
+
cache->postNotification(renderParent, AXObjectCache::AXValueChanged, true);
+ }
}
}
« no previous file with comments | « Source/WebCore/accessibility/AccessibilityObject.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698