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

Side by Side Diff: third_party/WebKit/Source/modules/accessibility/AXObject.h

Issue 1473833002: Fix bugs in accessible name calculation code exposed by Bryan Garaventa's test files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dumb_mistake
Patch Set: Fix android test expectation Created 5 years 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 * Copyright (C) 2008 Nuanti Ltd. 3 * Copyright (C) 2008 Nuanti Ltd.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 913 matching lines...) Expand 10 before | Expand all | Expand 10 after
924 924
925 protected: 925 protected:
926 AXID m_id; 926 AXID m_id;
927 AXObjectVector m_children; 927 AXObjectVector m_children;
928 mutable bool m_haveChildren; 928 mutable bool m_haveChildren;
929 AccessibilityRole m_role; 929 AccessibilityRole m_role;
930 AXObjectInclusion m_lastKnownIsIgnoredValue; 930 AXObjectInclusion m_lastKnownIsIgnoredValue;
931 LayoutRect m_explicitElementRect; 931 LayoutRect m_explicitElementRect;
932 932
933 // Used only inside textAlternative(): 933 // Used only inside textAlternative():
934 static String collapseWhitespace(const String&);
934 static String recursiveTextAlternative(const AXObject&, bool inAriaLabelledB yTraversal, AXObjectSet& visited); 935 static String recursiveTextAlternative(const AXObject&, bool inAriaLabelledB yTraversal, AXObjectSet& visited);
936 bool isHiddenForTextAlternativeCalculation() const;
935 String ariaTextAlternative(bool recursive, bool inAriaLabelledByTraversal, A XObjectSet& visited, AXNameFrom&, AXRelatedObjectVector*, NameSources*, bool* fo undTextAlternative) const; 937 String ariaTextAlternative(bool recursive, bool inAriaLabelledByTraversal, A XObjectSet& visited, AXNameFrom&, AXRelatedObjectVector*, NameSources*, bool* fo undTextAlternative) const;
936 String textFromElements(bool inAriaLabelledByTraversal, AXObjectSet& visited , WillBeHeapVector<RawPtrWillBeMember<Element>>& elements, AXRelatedObjectVector * relatedObjects) const; 938 String textFromElements(bool inAriaLabelledByTraversal, AXObjectSet& visited , WillBeHeapVector<RawPtrWillBeMember<Element>>& elements, AXRelatedObjectVector * relatedObjects) const;
937 void tokenVectorFromAttribute(Vector<String>&, const QualifiedName&) const; 939 void tokenVectorFromAttribute(Vector<String>&, const QualifiedName&) const;
938 void elementsFromAttribute(WillBeHeapVector<RawPtrWillBeMember<Element>>& el ements, const QualifiedName&) const; 940 void elementsFromAttribute(WillBeHeapVector<RawPtrWillBeMember<Element>>& el ements, const QualifiedName&) const;
939 void ariaLabelledbyElementVector(WillBeHeapVector<RawPtrWillBeMember<Element >>& elements) const; 941 void ariaLabelledbyElementVector(WillBeHeapVector<RawPtrWillBeMember<Element >>& elements) const;
940 String textFromAriaLabelledby(AXObjectSet& visited, AXRelatedObjectVector* r elatedObjects) const; 942 String textFromAriaLabelledby(AXObjectSet& visited, AXRelatedObjectVector* r elatedObjects) const;
941 String textFromAriaDescribedby(AXRelatedObjectVector* relatedObjects) const; 943 String textFromAriaDescribedby(AXRelatedObjectVector* relatedObjects) const;
942 944
943 virtual const AXObject* inheritsPresentationalRoleFrom() const { return 0; } 945 virtual const AXObject* inheritsPresentationalRoleFrom() const { return 0; }
944 946
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
979 #define DEFINE_AX_OBJECT_TYPE_CASTS(thisType, predicate) \ 981 #define DEFINE_AX_OBJECT_TYPE_CASTS(thisType, predicate) \
980 DEFINE_TYPE_CASTS(thisType, AXObject, object, object->predicate, object.pred icate) 982 DEFINE_TYPE_CASTS(thisType, AXObject, object, object->predicate, object.pred icate)
981 983
982 } // namespace blink 984 } // namespace blink
983 985
984 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::IgnoredReason); 986 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::IgnoredReason);
985 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::NameSource); 987 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::NameSource);
986 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::DescriptionSource); 988 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::DescriptionSource);
987 989
988 #endif // AXObject_h 990 #endif // AXObject_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698