Implementation for AXIsolatedObject::nextSibling and previousSibling.

[WebKit-https.git] / Source / WebCore / accessibility / AccessibilityRenderObject.cpp

diff --git a/Source/WebCore/accessibility/AccessibilityRenderObject.cpp b/Source/WebCore/accessibility/AccessibilityRenderObject.cpp
index 8476867..e1e129f 100644 (file)
--- a/Source/WebCore/accessibility/AccessibilityRenderObject.cpp
+++ b/Source/WebCore/accessibility/AccessibilityRenderObject.cpp
@@ -341,13 +341,16 @@ AccessibilityObject* AccessibilityRenderObject::previousSibling() const
 
     // Case 4: This node has no previous siblings, but its parent is an inline,
     // and is another node's inline continutation. Follow the continuation chain.
 
     // Case 4: This node has no previous siblings, but its parent is an inline,
     // and is another node's inline continutation. Follow the continuation chain.

-    else if (is<RenderInline>(*m_renderer->parent()) && (startOfConts = startOfContinuations(*m_renderer->parent())))
+    else if (is<RenderInline>(m_renderer->parent()) && (startOfConts = startOfContinuations(*m_renderer->parent())))

         previousSibling = childBeforeConsideringContinuations(startOfConts, m_renderer->parent()->firstChild());
 
     if (!previousSibling)
         return nullptr;
         previousSibling = childBeforeConsideringContinuations(startOfConts, m_renderer->parent()->firstChild());
 
     if (!previousSibling)
         return nullptr;

-    
-    return axObjectCache()->getOrCreate(previousSibling);
+
+    if (auto* objectCache = axObjectCache())
+        return objectCache->getOrCreate(previousSibling);
+
+    return nullptr;

 }
 
 static inline bool lastChildHasContinuation(RenderElement& renderer)
 }
 
 static inline bool lastChildHasContinuation(RenderElement& renderer)


@@ -410,13 +413,17 @@ AccessibilityObject* AccessibilityRenderObject::nextSibling() const
 
     if (!nextSibling)
         return nullptr;
 
     if (!nextSibling)
         return nullptr;

-    
+
+    auto* objectCache = axObjectCache();
+    if (!objectCache)
+        return nullptr;
+

     // Make sure next sibling has the same parent.
     // Make sure next sibling has the same parent.

-    AccessibilityObject* nextObj = axObjectCache()->getOrCreate(nextSibling);
-    if (nextObj && nextObj->parentObject() != this->parentObject())
+    auto* nextObject = objectCache->getOrCreate(nextSibling);
+    if (nextObject && nextObject->parentObject() != this->parentObject())

         return nullptr;
         return nullptr;

-    
-    return nextObj;
+
+    return nextObject;

 }
 
 static RenderBoxModelObject* nextContinuation(RenderObject& renderer)
 }
 
 static RenderBoxModelObject* nextContinuation(RenderObject& renderer)