Chromium Code Reviews| Index: content/browser/accessibility/browser_accessibility_manager.cc |
| diff --git a/content/browser/accessibility/browser_accessibility_manager.cc b/content/browser/accessibility/browser_accessibility_manager.cc |
| index 17c72919c0bed22102856937886275435aab23e7..a8ca1e5b08d6f58ef9856d707413618d1cb157f9 100644 |
| --- a/content/browser/accessibility/browser_accessibility_manager.cc |
| +++ b/content/browser/accessibility/browser_accessibility_manager.cc |
| @@ -452,10 +452,10 @@ void BrowserAccessibilityManager::ActivateFindInPageResult( |
| BrowserAccessibility* BrowserAccessibilityManager::GetActiveDescendantFocus( |
| BrowserAccessibility* focus) { |
| - if (!focus) |
| - return NULL; |
| + if (!focus || !focus->instance_active()) |
|
dmazzoni
2016/04/18 18:27:03
We shouldn't ever have to check instance_active()
|
| + return nullptr; |
| - int active_descendant_id; |
| + int32_t active_descendant_id; |
| if (focus->GetIntAttribute(ui::AX_ATTR_ACTIVEDESCENDANT_ID, |
| &active_descendant_id)) { |
| BrowserAccessibility* active_descendant = |