| Index: third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp
|
| diff --git a/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp b/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp
|
| index 109ce6a7fd73d77a726e80761d2b9058de9c5a4e..3cf57b9846c1fbab4ead98a655ade10a90b46edd 100644
|
| --- a/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp
|
| +++ b/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp
|
| @@ -1500,27 +1500,30 @@ IntPoint AXLayoutObject::clickPoint()
|
| AXObject* AXLayoutObject::accessibilityHitTest(const IntPoint& point) const
|
| {
|
| if (!m_layoutObject || !m_layoutObject->hasLayer())
|
| - return 0;
|
| + return nullptr;
|
|
|
| PaintLayer* layer = toLayoutBox(m_layoutObject)->layer();
|
|
|
| HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active);
|
| HitTestResult hitTestResult = HitTestResult(request, point);
|
| layer->hitTest(hitTestResult);
|
| - if (!hitTestResult.innerNode())
|
| - return 0;
|
|
|
| Node* node = hitTestResult.innerNode();
|
| + if (!node)
|
| + return nullptr;
|
|
|
| if (isHTMLAreaElement(node))
|
| return accessibilityImageMapHitTest(toHTMLAreaElement(node), point);
|
|
|
| - if (isHTMLOptionElement(node))
|
| + if (isHTMLOptionElement(node)) {
|
| node = toHTMLOptionElement(*node).ownerSelectElement();
|
| + if (!node)
|
| + return nullptr;
|
| + }
|
|
|
| LayoutObject* obj = node->layoutObject();
|
| if (!obj)
|
| - return 0;
|
| + return nullptr;
|
|
|
| AXObject* result = axObjectCache().getOrCreate(obj);
|
| result->updateChildrenIfNecessary();
|
|
|