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

Side by Side Diff: Source/core/accessibility/AXObject.cpp

Issue 67473002: Have ElementTraversal / NodeTraversal's next() methods take a reference (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase on master Created 7 years, 1 month 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 /* 1 /*
2 * Copyright (C) 2008, 2009, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2008, 2009, 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after
519 } 519 }
520 520
521 AXObject* AXObject::firstAccessibleObjectFromNode(const Node* node) 521 AXObject* AXObject::firstAccessibleObjectFromNode(const Node* node)
522 { 522 {
523 if (!node) 523 if (!node)
524 return 0; 524 return 0;
525 525
526 AXObjectCache* cache = node->document().axObjectCache(); 526 AXObjectCache* cache = node->document().axObjectCache();
527 AXObject* accessibleObject = cache->getOrCreate(node->renderer()); 527 AXObject* accessibleObject = cache->getOrCreate(node->renderer());
528 while (accessibleObject && accessibleObject->accessibilityIsIgnored()) { 528 while (accessibleObject && accessibleObject->accessibilityIsIgnored()) {
529 node = NodeTraversal::next(node); 529 node = NodeTraversal::next(*node);
530 530
531 while (node && !node->renderer()) 531 while (node && !node->renderer())
532 node = NodeTraversal::nextSkippingChildren(node); 532 node = NodeTraversal::nextSkippingChildren(node);
533 533
534 if (!node) 534 if (!node)
535 return 0; 535 return 0;
536 536
537 accessibleObject = cache->getOrCreate(node->renderer()); 537 accessibleObject = cache->getOrCreate(node->renderer());
538 } 538 }
539 539
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
897 return ToggleButtonRole; 897 return ToggleButtonRole;
898 if (ariaHasPopup()) 898 if (ariaHasPopup())
899 return PopUpButtonRole; 899 return PopUpButtonRole;
900 // We don't contemplate RadioButtonRole, as it depends on the input 900 // We don't contemplate RadioButtonRole, as it depends on the input
901 // type. 901 // type.
902 902
903 return ButtonRole; 903 return ButtonRole;
904 } 904 }
905 905
906 } // namespace WebCore 906 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/accessibility/AXNodeObject.cpp ('k') | Source/core/accessibility/AXRenderObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698