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..c2d9b82a6c8e52ea6c7fb853a0080a32c08864ea 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,17 +172,11 @@ AXObject* AXObjectCacheImpl::focusedObject()
             if (Element* focusedElementInPopup = axPopup->getDocument()->focusedElement())
                 focusedNode = focusedElementInPopup;
         }
-
     }
 
     AXObject* obj = getOrCreate(focusedNode);
     if (!obj)
-        return 0;
-
-    if (obj->shouldFocusActiveDescendant()) {
-        if (AXObject* descendant = obj->activeDescendant())
-            obj = descendant;
-    }
+        return nullptr;
 
     // the HTML element, for example, is focusable but has an AX object that is ignored
     if (obj->accessibilityIsIgnored())
@@ -1140,15 +1134,6 @@ void AXObjectCacheImpl::postPlatformNotification(AXObject* obj, AXNotification n
         return;
 
     ChromeClient& client = obj->getDocument()->axObjectCacheOwner().page()->chromeClient();
-
-    if (notification == AXActiveDescendantChanged
-        && obj->getDocument()->focusedElement()
-        && obj->getNode() == obj->getDocument()->focusedElement()) {
-        // Calling handleFocusedUIElementChanged will focus the new active
-        // descendant and send the AXFocusedUIElementChanged notification.
-        handleFocusedUIElementChanged(0, obj->getDocument()->focusedElement());
-    }
-
     client.postAccessibilityNotification(obj, notification);
 }