| 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 |
| 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 12 * Library General Public License for more details. | 12 * Library General Public License for more details. |
| 13 * | 13 * |
| 14 * You should have received a copy of the GNU Library General Public License | 14 * You should have received a copy of the GNU Library General Public License |
| 15 * along with this library; see the file COPYING.LIB. If not, write to | 15 * along with this library; see the file COPYING.LIB. If not, write to |
| 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 17 * Boston, MA 02110-1301, USA. | 17 * Boston, MA 02110-1301, USA. |
| 18 * | 18 * |
| 19 */ | 19 */ |
| 20 | 20 |
| 21 #include "config.h" | 21 #include "config.h" |
| 22 #include "modules/accessibility/AXProgressIndicator.h" | 22 #include "modules/accessibility/AXProgressIndicator.h" |
| 23 | 23 |
| 24 #include "core/html/HTMLProgressElement.h" | 24 #include "core/html/HTMLProgressElement.h" |
| 25 #include "core/rendering/RenderProgress.h" | 25 #include "core/layout/LayoutProgress.h" |
| 26 #include "modules/accessibility/AXObjectCacheImpl.h" | 26 #include "modules/accessibility/AXObjectCacheImpl.h" |
| 27 #include "platform/FloatConversion.h" | 27 #include "platform/FloatConversion.h" |
| 28 | 28 |
| 29 namespace blink { | 29 namespace blink { |
| 30 | 30 |
| 31 using namespace HTMLNames; | 31 using namespace HTMLNames; |
| 32 | 32 |
| 33 AXProgressIndicator::AXProgressIndicator(RenderProgress* renderer, AXObjectCache
Impl* axObjectCache) | 33 AXProgressIndicator::AXProgressIndicator(LayoutProgress* renderer, AXObjectCache
Impl* axObjectCache) |
| 34 : AXRenderObject(renderer, axObjectCache) | 34 : AXRenderObject(renderer, axObjectCache) |
| 35 { | 35 { |
| 36 } | 36 } |
| 37 | 37 |
| 38 PassRefPtr<AXProgressIndicator> AXProgressIndicator::create(RenderProgress* rend
erer, AXObjectCacheImpl* axObjectCache) | 38 PassRefPtr<AXProgressIndicator> AXProgressIndicator::create(LayoutProgress* rend
erer, AXObjectCacheImpl* axObjectCache) |
| 39 { | 39 { |
| 40 return adoptRef(new AXProgressIndicator(renderer, axObjectCache)); | 40 return adoptRef(new AXProgressIndicator(renderer, axObjectCache)); |
| 41 } | 41 } |
| 42 | 42 |
| 43 bool AXProgressIndicator::computeAccessibilityIsIgnored() const | 43 bool AXProgressIndicator::computeAccessibilityIsIgnored() const |
| 44 { | 44 { |
| 45 return accessibilityIsIgnoredByDefault(); | 45 return accessibilityIsIgnoredByDefault(); |
| 46 } | 46 } |
| 47 | 47 |
| 48 float AXProgressIndicator::valueForRange() const | 48 float AXProgressIndicator::valueForRange() const |
| (...skipping 18 matching lines...) Expand all Loading... |
| 67 float AXProgressIndicator::minValueForRange() const | 67 float AXProgressIndicator::minValueForRange() const |
| 68 { | 68 { |
| 69 if (hasAttribute(aria_valueminAttr)) | 69 if (hasAttribute(aria_valueminAttr)) |
| 70 return getAttribute(aria_valueminAttr).toFloat(); | 70 return getAttribute(aria_valueminAttr).toFloat(); |
| 71 | 71 |
| 72 return 0.0f; | 72 return 0.0f; |
| 73 } | 73 } |
| 74 | 74 |
| 75 HTMLProgressElement* AXProgressIndicator::element() const | 75 HTMLProgressElement* AXProgressIndicator::element() const |
| 76 { | 76 { |
| 77 return toRenderProgress(m_renderer)->progressElement(); | 77 return toLayoutProgress(m_renderer)->progressElement(); |
| 78 } | 78 } |
| 79 | 79 |
| 80 | 80 |
| 81 } // namespace blink | 81 } // namespace blink |
| OLD | NEW |