Various fixes for aria-activedescendant.

third_party/WebKit/Source/modules/accessibility/AXObjectCacheImpl.cpp

Index: third_party/WebKit/Source/modules/accessibility/AXObjectCacheImpl.cpp
diff --git a/third_party/WebKit/Source/modules/accessibility/AXObjectCacheImpl.cpp b/third_party/WebKit/Source/modules/accessibility/AXObjectCacheImpl.cpp
index 6b21c0c8246edaba833b44e0daa5a9997173c125..e7563fc6d746e163208138b539ec13bb5a6da5b5 100644
--- a/third_party/WebKit/Source/modules/accessibility/AXObjectCacheImpl.cpp
+++ b/third_party/WebKit/Source/modules/accessibility/AXObjectCacheImpl.cpp
@@ -155,7 +155,7 @@ AXObject* AXObjectCacheImpl::focusedImageMapUIElement(HTMLAreaElement* areaEleme
 AXObject* AXObjectCacheImpl::focusedObject()
 {
     if (!accessibilityEnabled())
-        return 0;
+        return nullptr;
 
     Node* focusedNode = m_document->focusedElement();
     if (!focusedNode)
@@ -172,14 +172,13 @@ AXObject* AXObjectCacheImpl::focusedObject()
             if (Element* focusedElementInPopup = axPopup->getDocument()->focusedElement())
                 focusedNode = focusedElementInPopup;
         }
-
     }
 
     AXObject* obj = getOrCreate(focusedNode);
     if (!obj)
-        return 0;
+        return nullptr;
 
-    if (obj->shouldFocusActiveDescendant()) {
+    if (obj->supportsActiveDescendant()) {

[dmazzoni, 2016/03/31 05:48:30]

Hmmm, this code makes it seem like we were already following the active
descendant when determining what node has focus. Why was this not working?

         if (AXObject* descendant = obj->activeDescendant())
             obj = descendant;
     }