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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/accessibility/browser_accessibility_manager.h" 5 #include "content/browser/accessibility/browser_accessibility_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 if (ax_tree_id_changed || root_changed) { 607 if (ax_tree_id_changed || root_changed) {
608 BrowserAccessibility* parent = GetParentNodeFromParentTree(); 608 BrowserAccessibility* parent = GetParentNodeFromParentTree();
609 if (parent) { 609 if (parent) {
610 parent->OnDataChanged(); 610 parent->OnDataChanged();
611 parent->manager()->NotifyAccessibilityEvent( 611 parent->manager()->NotifyAccessibilityEvent(
612 ui::AX_EVENT_CHILDREN_CHANGED, parent); 612 ui::AX_EVENT_CHILDREN_CHANGED, parent);
613 } 613 }
614 } 614 }
615 } 615 }
616 616
617 BrowserAccessibilityDelegate* 617 BrowserAccessibilityManager* BrowserAccessibilityManager::GetRootManager() {
618 BrowserAccessibilityManager::GetDelegateFromRootManager() {
619 if (!GetRoot()) 618 if (!GetRoot())
620 return nullptr; 619 return nullptr;
621 int parent_tree_id = GetTreeData().parent_tree_id; 620 int parent_tree_id = GetTreeData().parent_tree_id;
622 BrowserAccessibilityManager* parent_manager = 621 BrowserAccessibilityManager* parent_manager =
623 BrowserAccessibilityManager::FromID(parent_tree_id); 622 BrowserAccessibilityManager::FromID(parent_tree_id);
624 if (parent_manager) 623 if (parent_manager)
625 return parent_manager->GetDelegateFromRootManager(); 624 return parent_manager->GetRootManager();
626 return delegate(); 625 return this;
626 }
627
628 BrowserAccessibilityDelegate*
629 BrowserAccessibilityManager::GetDelegateFromRootManager() {
630 BrowserAccessibilityManager* root_manager = GetRootManager();
631 if (root_manager)
632 return root_manager->delegate();
633 return nullptr;
627 } 634 }
628 635
629 ui::AXTreeUpdate 636 ui::AXTreeUpdate
630 BrowserAccessibilityManager::SnapshotAXTreeForTesting() { 637 BrowserAccessibilityManager::SnapshotAXTreeForTesting() {
631 scoped_ptr<ui::AXTreeSource<const ui::AXNode*, 638 scoped_ptr<ui::AXTreeSource<const ui::AXNode*,
632 ui::AXNodeData, 639 ui::AXNodeData,
633 ui::AXTreeData> > tree_source( 640 ui::AXTreeData> > tree_source(
634 tree_->CreateTreeSource()); 641 tree_->CreateTreeSource());
635 ui::AXTreeSerializer<const ui::AXNode*, 642 ui::AXTreeSerializer<const ui::AXNode*,
636 ui::AXNodeData, 643 ui::AXNodeData,
637 ui::AXTreeData> serializer(tree_source.get()); 644 ui::AXTreeData> serializer(tree_source.get());
638 ui::AXTreeUpdate update; 645 ui::AXTreeUpdate update;
639 serializer.SerializeChanges(tree_->root(), &update); 646 serializer.SerializeChanges(tree_->root(), &update);
640 return update; 647 return update;
641 } 648 }
642 649
643 } // namespace content 650 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698