Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(630)

Unified Diff: content/browser/accessibility/browser_accessibility_manager.cc

Issue 1552683002: Enable DumpAccessibilityTree tests to use cross-process iframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebaseline last Android test Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 8979f10f0f0580792be6d7300938c28f31b5babf..75c0b821589fd4c547be0fa412253e53f458b6b8 100644
--- a/content/browser/accessibility/browser_accessibility_manager.cc
+++ b/content/browser/accessibility/browser_accessibility_manager.cc
@@ -614,16 +614,23 @@ void BrowserAccessibilityManager::OnAtomicUpdateFinished(
}
}
-BrowserAccessibilityDelegate*
- BrowserAccessibilityManager::GetDelegateFromRootManager() {
+BrowserAccessibilityManager* BrowserAccessibilityManager::GetRootManager() {
if (!GetRoot())
return nullptr;
int parent_tree_id = GetTreeData().parent_tree_id;
BrowserAccessibilityManager* parent_manager =
BrowserAccessibilityManager::FromID(parent_tree_id);
if (parent_manager)
- return parent_manager->GetDelegateFromRootManager();
- return delegate();
+ return parent_manager->GetRootManager();
+ return this;
+}
+
+BrowserAccessibilityDelegate*
+ BrowserAccessibilityManager::GetDelegateFromRootManager() {
+ BrowserAccessibilityManager* root_manager = GetRootManager();
+ if (root_manager)
+ return root_manager->delegate();
+ return nullptr;
}
ui::AXTreeUpdate

Powered by Google App Engine
This is Rietveld 408576698