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

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

Issue 1039873002: AX presentation role should be inherited to its required owned elements. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Update Created 5 years, 8 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
« no previous file with comments | « Source/modules/accessibility/AXObject.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 , m_haveChildren(false) 230 , m_haveChildren(false)
231 , m_role(UnknownRole) 231 , m_role(UnknownRole)
232 , m_lastKnownIsIgnoredValue(DefaultBehavior) 232 , m_lastKnownIsIgnoredValue(DefaultBehavior)
233 , m_detached(false) 233 , m_detached(false)
234 , m_parent(0) 234 , m_parent(0)
235 , m_lastModificationCount(-1) 235 , m_lastModificationCount(-1)
236 , m_cachedIsIgnored(false) 236 , m_cachedIsIgnored(false)
237 , m_cachedIsInertOrAriaHidden(false) 237 , m_cachedIsInertOrAriaHidden(false)
238 , m_cachedIsDescendantOfBarrenParent(false) 238 , m_cachedIsDescendantOfBarrenParent(false)
239 , m_cachedIsDescendantOfDisabledNode(false) 239 , m_cachedIsDescendantOfDisabledNode(false)
240 , m_cachedHasInheritedPresentationalRole(false)
240 , m_cachedLiveRegionRoot(0) 241 , m_cachedLiveRegionRoot(0)
241 , m_axObjectCache(axObjectCache) 242 , m_axObjectCache(axObjectCache)
242 { 243 {
243 } 244 }
244 245
245 AXObject::~AXObject() 246 AXObject::~AXObject()
246 { 247 {
247 ASSERT(isDetached()); 248 ASSERT(isDetached());
248 } 249 }
249 250
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 if (!cache) 367 if (!cache)
367 return; 368 return;
368 369
369 if (cache->modificationCount() == m_lastModificationCount) 370 if (cache->modificationCount() == m_lastModificationCount)
370 return; 371 return;
371 372
372 m_lastModificationCount = cache->modificationCount(); 373 m_lastModificationCount = cache->modificationCount();
373 m_cachedIsInertOrAriaHidden = computeIsInertOrAriaHidden(); 374 m_cachedIsInertOrAriaHidden = computeIsInertOrAriaHidden();
374 m_cachedIsDescendantOfBarrenParent = computeIsDescendantOfBarrenParent(); 375 m_cachedIsDescendantOfBarrenParent = computeIsDescendantOfBarrenParent();
375 m_cachedIsDescendantOfDisabledNode = computeIsDescendantOfDisabledNode(); 376 m_cachedIsDescendantOfDisabledNode = computeIsDescendantOfDisabledNode();
377 m_cachedHasInheritedPresentationalRole = computeHasInheritedPresentationalRo le();
376 m_cachedIsIgnored = computeAccessibilityIsIgnored(); 378 m_cachedIsIgnored = computeAccessibilityIsIgnored();
377 m_cachedLiveRegionRoot = isLiveRegion() ? 379 m_cachedLiveRegionRoot = isLiveRegion() ?
378 this : 380 this :
379 (parentObjectIfExists() ? parentObjectIfExists()->liveRegionRoot() : 0); 381 (parentObjectIfExists() ? parentObjectIfExists()->liveRegionRoot() : 0);
380 } 382 }
381 383
382 bool AXObject::accessibilityIsIgnoredByDefault() const 384 bool AXObject::accessibilityIsIgnoredByDefault() const
383 { 385 {
384 return defaultObjectInclusion() == IgnoreObject; 386 return defaultObjectInclusion() == IgnoreObject;
385 } 387 }
(...skipping 759 matching lines...) Expand 10 before | Expand all | Expand 10 after
1145 } 1147 }
1146 1148
1147 const AtomicString& AXObject::roleName(AccessibilityRole role) 1149 const AtomicString& AXObject::roleName(AccessibilityRole role)
1148 { 1150 {
1149 static const Vector<AtomicString>* roleNameVector = createRoleNameVector(); 1151 static const Vector<AtomicString>* roleNameVector = createRoleNameVector();
1150 1152
1151 return roleNameVector->at(role); 1153 return roleNameVector->at(role);
1152 } 1154 }
1153 1155
1154 } // namespace blink 1156 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/accessibility/AXObject.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698