diff options
| author | Steve Block <steveblock@google.com> | 2010-09-29 17:32:26 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-09-29 17:35:08 +0100 |
| commit | 68513a70bcd92384395513322f1b801e7bf9c729 (patch) | |
| tree | 161b50f75a5921d61731bb25e730005994fcec85 /WebCore/accessibility/mac | |
| parent | fd5c6425ce58eb75211be7718d5dee960842a37e (diff) | |
| download | external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.zip external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.tar.gz external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.tar.bz2 | |
Merge WebKit at r67908: Initial merge by Git
Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
Diffstat (limited to 'WebCore/accessibility/mac')
| -rw-r--r-- | WebCore/accessibility/mac/AccessibilityObjectWrapper.mm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm b/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm index 859a799..e3e28d7 100644 --- a/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm +++ b/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm @@ -1972,11 +1972,11 @@ static NSString* roleValueToNSString(AccessibilityRole value) - (BOOL)accessibilityIsIgnored { if (!m_object) - return nil; + return YES; m_object->updateBackingStore(); if (!m_object) - return nil; + return YES; if (m_object->isAttachment()) return [[self attachmentView] accessibilityIsIgnored]; @@ -2354,7 +2354,10 @@ static RenderObject* rendererForView(NSView* view) // dispatch if ([attribute isEqualToString:@"AXUIElementForTextMarker"]) { VisiblePosition visiblePos = visiblePositionForTextMarker(textMarker); - return m_object->accessibilityObjectForPosition(visiblePos)->wrapper(); + AccessibilityObject* axObject = m_object->accessibilityObjectForPosition(visiblePos); + if (!axObject) + return nil; + return axObject->wrapper(); } if ([attribute isEqualToString:@"AXTextMarkerRangeForUIElement"]) { |