diff options
| author | Steve Block <steveblock@google.com> | 2010-08-27 11:02:25 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-09-02 17:17:20 +0100 |
| commit | e8b154fd68f9b33be40a3590e58347f353835f5c (patch) | |
| tree | 0733ce26384183245aaa5656af26c653636fe6c1 /WebCore/accessibility | |
| parent | da56157816334089526a7a115a85fd85a6e9a1dc (diff) | |
| download | external_webkit-e8b154fd68f9b33be40a3590e58347f353835f5c.zip external_webkit-e8b154fd68f9b33be40a3590e58347f353835f5c.tar.gz external_webkit-e8b154fd68f9b33be40a3590e58347f353835f5c.tar.bz2 | |
Merge WebKit at r66079 : Initial merge by git
Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
Diffstat (limited to 'WebCore/accessibility')
| -rw-r--r-- | WebCore/accessibility/AccessibilityRenderObject.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/WebCore/accessibility/AccessibilityRenderObject.cpp b/WebCore/accessibility/AccessibilityRenderObject.cpp index 6b90b63..92c57c6 100644 --- a/WebCore/accessibility/AccessibilityRenderObject.cpp +++ b/WebCore/accessibility/AccessibilityRenderObject.cpp @@ -370,9 +370,12 @@ AccessibilityObject* AccessibilityRenderObject::nextSibling() const static RenderBoxModelObject* nextContinuation(RenderObject* renderer) { - if (renderer->isInline() && !renderer->isReplaced()) + ASSERT(renderer); + if (renderer->isRenderInline() && !renderer->isReplaced()) return toRenderInline(renderer)->continuation(); - return toRenderBlock(renderer)->inlineElementContinuation(); + if (renderer->isRenderBlock()) + return toRenderBlock(renderer)->inlineElementContinuation(); + return 0; } RenderObject* AccessibilityRenderObject::renderParentObject() const |