| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). | 2 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). |
| 3 * | 3 * |
| 4 * This library is free software; you can redistribute it and/or | 4 * This library is free software; you can redistribute it and/or |
| 5 * modify it under the terms of the GNU Library General Public | 5 * modify it under the terms of the GNU Library General Public |
| 6 * License as published by the Free Software Foundation; either | 6 * License as published by the Free Software Foundation; either |
| 7 * version 2 of the License, or (at your option) any later version. | 7 * version 2 of the License, or (at your option) any later version. |
| 8 * | 8 * |
| 9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 AXProgressIndicator::AXProgressIndicator(LayoutProgress* layoutObject, AXObjectC
acheImpl* axObjectCache) | 33 AXProgressIndicator::AXProgressIndicator(LayoutProgress* layoutObject, AXObjectC
acheImpl* axObjectCache) |
| 34 : AXLayoutObject(layoutObject, axObjectCache) | 34 : AXLayoutObject(layoutObject, axObjectCache) |
| 35 { | 35 { |
| 36 } | 36 } |
| 37 | 37 |
| 38 PassRefPtr<AXProgressIndicator> AXProgressIndicator::create(LayoutProgress* layo
utObject, AXObjectCacheImpl* axObjectCache) | 38 PassRefPtr<AXProgressIndicator> AXProgressIndicator::create(LayoutProgress* layo
utObject, AXObjectCacheImpl* axObjectCache) |
| 39 { | 39 { |
| 40 return adoptRef(new AXProgressIndicator(layoutObject, axObjectCache)); | 40 return adoptRef(new AXProgressIndicator(layoutObject, axObjectCache)); |
| 41 } | 41 } |
| 42 | 42 |
| 43 AccessibilityRole AXProgressIndicator::roleValue() const | 43 AccessibilityRole AXProgressIndicator::determineAccessibilityRole() |
| 44 { | 44 { |
| 45 AccessibilityRole ariaRole = ariaRoleAttribute(); | 45 if ((m_ariaRole = determineAriaRoleAttribute()) != UnknownRole) |
| 46 if (ariaRole != UnknownRole) | 46 return m_ariaRole; |
| 47 return ariaRole; | |
| 48 return ProgressIndicatorRole; | 47 return ProgressIndicatorRole; |
| 49 } | 48 } |
| 50 | 49 |
| 51 bool AXProgressIndicator::computeAccessibilityIsIgnored() const | 50 bool AXProgressIndicator::computeAccessibilityIsIgnored() const |
| 52 { | 51 { |
| 53 return accessibilityIsIgnoredByDefault(); | 52 return accessibilityIsIgnoredByDefault(); |
| 54 } | 53 } |
| 55 | 54 |
| 56 float AXProgressIndicator::valueForRange() const | 55 float AXProgressIndicator::valueForRange() const |
| 57 { | 56 { |
| (...skipping 22 matching lines...) Expand all Loading... |
| 80 return 0.0f; | 79 return 0.0f; |
| 81 } | 80 } |
| 82 | 81 |
| 83 HTMLProgressElement* AXProgressIndicator::element() const | 82 HTMLProgressElement* AXProgressIndicator::element() const |
| 84 { | 83 { |
| 85 return toLayoutProgress(m_layoutObject)->progressElement(); | 84 return toLayoutProgress(m_layoutObject)->progressElement(); |
| 86 } | 85 } |
| 87 | 86 |
| 88 | 87 |
| 89 } // namespace blink | 88 } // namespace blink |
| OLD | NEW |