| OLD | NEW |
| 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 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 , m_haveChildren(false) | 229 , m_haveChildren(false) |
| 230 , m_role(UnknownRole) | 230 , m_role(UnknownRole) |
| 231 , m_lastKnownIsIgnoredValue(DefaultBehavior) | 231 , m_lastKnownIsIgnoredValue(DefaultBehavior) |
| 232 , m_detached(false) | 232 , m_detached(false) |
| 233 , m_parent(0) | 233 , m_parent(0) |
| 234 , m_lastModificationCount(-1) | 234 , m_lastModificationCount(-1) |
| 235 , m_cachedIsIgnored(false) | 235 , m_cachedIsIgnored(false) |
| 236 , m_cachedIsInertOrAriaHidden(false) | 236 , m_cachedIsInertOrAriaHidden(false) |
| 237 , m_cachedIsDescendantOfBarrenParent(false) | 237 , m_cachedIsDescendantOfBarrenParent(false) |
| 238 , m_cachedIsDescendantOfDisabledNode(false) | 238 , m_cachedIsDescendantOfDisabledNode(false) |
| 239 , m_cachedHasInheritedPresentationRole(false) |
| 239 , m_cachedLiveRegionRoot(0) | 240 , m_cachedLiveRegionRoot(0) |
| 240 , m_axObjectCache(axObjectCache) | 241 , m_axObjectCache(axObjectCache) |
| 241 { | 242 { |
| 242 } | 243 } |
| 243 | 244 |
| 244 AXObject::~AXObject() | 245 AXObject::~AXObject() |
| 245 { | 246 { |
| 246 ASSERT(isDetached()); | 247 ASSERT(isDetached()); |
| 247 } | 248 } |
| 248 | 249 |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 363 if (!cache) | 364 if (!cache) |
| 364 return; | 365 return; |
| 365 | 366 |
| 366 if (cache->modificationCount() == m_lastModificationCount) | 367 if (cache->modificationCount() == m_lastModificationCount) |
| 367 return; | 368 return; |
| 368 | 369 |
| 369 m_lastModificationCount = cache->modificationCount(); | 370 m_lastModificationCount = cache->modificationCount(); |
| 370 m_cachedIsInertOrAriaHidden = computeIsInertOrAriaHidden(); | 371 m_cachedIsInertOrAriaHidden = computeIsInertOrAriaHidden(); |
| 371 m_cachedIsDescendantOfBarrenParent = computeIsDescendantOfBarrenParent(); | 372 m_cachedIsDescendantOfBarrenParent = computeIsDescendantOfBarrenParent(); |
| 372 m_cachedIsDescendantOfDisabledNode = computeIsDescendantOfDisabledNode(); | 373 m_cachedIsDescendantOfDisabledNode = computeIsDescendantOfDisabledNode(); |
| 374 m_cachedHasInheritedPresentationRole = computeHasInheritedPresentationRole()
; |
| 373 m_cachedIsIgnored = computeAccessibilityIsIgnored(); | 375 m_cachedIsIgnored = computeAccessibilityIsIgnored(); |
| 374 m_cachedLiveRegionRoot = isLiveRegion() ? | 376 m_cachedLiveRegionRoot = isLiveRegion() ? |
| 375 this : | 377 this : |
| 376 (parentObjectIfExists() ? parentObjectIfExists()->liveRegionRoot() : 0); | 378 (parentObjectIfExists() ? parentObjectIfExists()->liveRegionRoot() : 0); |
| 377 } | 379 } |
| 378 | 380 |
| 379 bool AXObject::accessibilityIsIgnoredByDefault() const | 381 bool AXObject::accessibilityIsIgnoredByDefault() const |
| 380 { | 382 { |
| 381 return defaultObjectInclusion() == IgnoreObject; | 383 return defaultObjectInclusion() == IgnoreObject; |
| 382 } | 384 } |
| (...skipping 769 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1152 } | 1154 } |
| 1153 | 1155 |
| 1154 const AtomicString& AXObject::roleName(AccessibilityRole role) | 1156 const AtomicString& AXObject::roleName(AccessibilityRole role) |
| 1155 { | 1157 { |
| 1156 static const Vector<AtomicString>* roleNameVector = createRoleNameVector(); | 1158 static const Vector<AtomicString>* roleNameVector = createRoleNameVector(); |
| 1157 | 1159 |
| 1158 return roleNameVector->at(role); | 1160 return roleNameVector->at(role); |
| 1159 } | 1161 } |
| 1160 | 1162 |
| 1161 } // namespace blink | 1163 } // namespace blink |
| OLD | NEW |