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

Side by Side Diff: content/browser/accessibility/browser_accessibility_manager.cc

Issue 880523002: Revert of Send Windows accessibility events based on tree updates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@implicit_1_tests
Patch Set: Created 5 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 "base/logging.h" 7 #include "base/logging.h"
8 #include "content/browser/accessibility/browser_accessibility.h" 8 #include "content/browser/accessibility/browser_accessibility.h"
9 #include "content/common/accessibility_messages.h" 9 #include "content/common/accessibility_messages.h"
10 #include "ui/accessibility/ax_tree_serializer.h" 10 #include "ui/accessibility/ax_tree_serializer.h"
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 else 407 else
408 focus_ = NULL; 408 focus_ = NULL;
409 } 409 }
410 if (id_wrapper_map_.find(node->id()) == id_wrapper_map_.end()) 410 if (id_wrapper_map_.find(node->id()) == id_wrapper_map_.end())
411 return; 411 return;
412 GetFromAXNode(node)->Destroy(); 412 GetFromAXNode(node)->Destroy();
413 id_wrapper_map_.erase(node->id()); 413 id_wrapper_map_.erase(node->id());
414 } 414 }
415 415
416 void BrowserAccessibilityManager::OnSubtreeWillBeDeleted(ui::AXNode* node) { 416 void BrowserAccessibilityManager::OnSubtreeWillBeDeleted(ui::AXNode* node) {
417 BrowserAccessibility* obj = GetFromAXNode(node);
418 if (obj)
419 obj->OnSubtreeWillBeDeleted();
420 } 417 }
421 418
422 void BrowserAccessibilityManager::OnNodeCreated(ui::AXNode* node) { 419 void BrowserAccessibilityManager::OnNodeCreated(ui::AXNode* node) {
423 BrowserAccessibility* wrapper = factory_->Create(); 420 BrowserAccessibility* wrapper = factory_->Create();
424 wrapper->Init(this, node); 421 wrapper->Init(this, node);
425 id_wrapper_map_[node->id()] = wrapper; 422 id_wrapper_map_[node->id()] = wrapper;
426 wrapper->OnDataChanged(); 423 wrapper->OnDataChanged();
427 } 424 }
428 425
429 void BrowserAccessibilityManager::OnNodeChanged(ui::AXNode* node) { 426 void BrowserAccessibilityManager::OnNodeChanged(ui::AXNode* node) {
430 GetFromAXNode(node)->OnDataChanged(); 427 GetFromAXNode(node)->OnDataChanged();
431 } 428 }
432 429
433 void BrowserAccessibilityManager::OnAtomicUpdateFinished( 430 void BrowserAccessibilityManager::OnAtomicUpdateFinished(
434 bool root_changed, 431 bool root_changed, const std::vector<ui::AXTreeDelegate::Change>& changes) {
435 const std::vector<ui::AXTreeDelegate::Change>& changes) { 432 for (size_t i = 0; i < changes.size(); ++i)
436 for (size_t i = 0; i < changes.size(); ++i) { 433 GetFromAXNode(changes[i].node)->OnUpdateFinished();
437 BrowserAccessibility* obj = GetFromAXNode(changes[i].node);
438 if (!obj)
439 continue;
440
441 obj->OnUpdateFinished();
442 if (changes[i].type == AXTreeDelegate::SUBTREE_CREATED)
443 GetFromAXNode(changes[i].node)->OnSubtreeCreationFinished();
444 }
445 } 434 }
446 435
447 BrowserAccessibilityDelegate* 436 BrowserAccessibilityDelegate*
448 BrowserAccessibilityManager::GetDelegateFromRootManager() { 437 BrowserAccessibilityManager::GetDelegateFromRootManager() {
449 BrowserAccessibilityManager* manager = this; 438 BrowserAccessibilityManager* manager = this;
450 while (manager->delegate()) { 439 while (manager->delegate()) {
451 BrowserAccessibility* host_node_in_parent_frame = 440 BrowserAccessibility* host_node_in_parent_frame =
452 manager->delegate()->AccessibilityGetParentFrame(); 441 manager->delegate()->AccessibilityGetParentFrame();
453 if (!host_node_in_parent_frame) 442 if (!host_node_in_parent_frame)
454 break; 443 break;
455 manager = host_node_in_parent_frame->manager(); 444 manager = host_node_in_parent_frame->manager();
456 } 445 }
457 return manager->delegate(); 446 return manager->delegate();
458 } 447 }
459 448
460 ui::AXTreeUpdate BrowserAccessibilityManager::SnapshotAXTreeForTesting() { 449 ui::AXTreeUpdate BrowserAccessibilityManager::SnapshotAXTreeForTesting() {
461 scoped_ptr<ui::AXTreeSource<const ui::AXNode*> > tree_source( 450 scoped_ptr<ui::AXTreeSource<const ui::AXNode*> > tree_source(
462 tree_->CreateTreeSource()); 451 tree_->CreateTreeSource());
463 ui::AXTreeSerializer<const ui::AXNode*> serializer(tree_source.get()); 452 ui::AXTreeSerializer<const ui::AXNode*> serializer(tree_source.get());
464 ui::AXTreeUpdate update; 453 ui::AXTreeUpdate update;
465 serializer.SerializeChanges(tree_->GetRoot(), &update); 454 serializer.SerializeChanges(tree_->GetRoot(), &update);
466 return update; 455 return update;
467 } 456 }
468 457
469 } // namespace content 458 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698