| Index: Source/core/accessibility/AccessibilitySlider.cpp
|
| diff --git a/Source/core/accessibility/AccessibilitySlider.cpp b/Source/core/accessibility/AccessibilitySlider.cpp
|
| index 51a995a9a213a79b9005c4102c932fe29ae37bad..e5129b0d319a8f4c9cd541a6e00c5e0b1f70f8cb 100644
|
| --- a/Source/core/accessibility/AccessibilitySlider.cpp
|
| +++ b/Source/core/accessibility/AccessibilitySlider.cpp
|
| @@ -34,7 +34,7 @@
|
| #include "core/html/shadow/SliderThumbElement.h"
|
|
|
| namespace WebCore {
|
| -
|
| +
|
| using namespace HTMLNames;
|
|
|
| AccessibilitySlider::AccessibilitySlider(RenderObject* renderer)
|
| @@ -52,11 +52,11 @@ AccessibilityOrientation AccessibilitySlider::orientation() const
|
| // Default to horizontal in the unknown case.
|
| if (!m_renderer)
|
| return AccessibilityOrientationHorizontal;
|
| -
|
| +
|
| RenderStyle* style = m_renderer->style();
|
| if (!style)
|
| return AccessibilityOrientationHorizontal;
|
| -
|
| +
|
| ControlPart styleAppearance = style->appearance();
|
| switch (styleAppearance) {
|
| case SliderThumbHorizontalPart:
|
| @@ -64,21 +64,21 @@ AccessibilityOrientation AccessibilitySlider::orientation() const
|
| case MediaSliderPart:
|
| case MediaFullScreenVolumeSliderPart:
|
| return AccessibilityOrientationHorizontal;
|
| -
|
| - case SliderThumbVerticalPart:
|
| +
|
| + case SliderThumbVerticalPart:
|
| case SliderVerticalPart:
|
| case MediaVolumeSliderPart:
|
| return AccessibilityOrientationVertical;
|
| -
|
| +
|
| default:
|
| return AccessibilityOrientationHorizontal;
|
| }
|
| }
|
| -
|
| +
|
| void AccessibilitySlider::addChildren()
|
| {
|
| - ASSERT(!m_haveChildren);
|
| -
|
| + ASSERT(!m_haveChildren);
|
| +
|
| m_haveChildren = true;
|
|
|
| AXObjectCache* cache = m_renderer->document()->axObjectCache();
|
| @@ -98,7 +98,7 @@ const AtomicString& AccessibilitySlider::getAttribute(const QualifiedName& attri
|
| {
|
| return element()->getAttribute(attribute);
|
| }
|
| -
|
| +
|
| AccessibilityObject* AccessibilitySlider::elementAccessibilityHitTest(const IntPoint& point) const
|
| {
|
| if (m_children.size()) {
|
| @@ -106,7 +106,7 @@ AccessibilityObject* AccessibilitySlider::elementAccessibilityHitTest(const IntP
|
| if (m_children[0]->elementRect().contains(point))
|
| return m_children[0].get();
|
| }
|
| -
|
| +
|
| return axObjectCache()->getOrCreate(m_renderer);
|
| }
|
|
|
| @@ -128,7 +128,7 @@ float AccessibilitySlider::minValueForRange() const
|
| void AccessibilitySlider::setValue(const String& value)
|
| {
|
| HTMLInputElement* input = element();
|
| -
|
| +
|
| if (input->value() == value)
|
| return;
|
|
|
| @@ -152,12 +152,12 @@ PassRefPtr<AccessibilitySliderThumb> AccessibilitySliderThumb::create()
|
| {
|
| return adoptRef(new AccessibilitySliderThumb());
|
| }
|
| -
|
| +
|
| LayoutRect AccessibilitySliderThumb::elementRect() const
|
| {
|
| if (!m_parent)
|
| return LayoutRect();
|
| -
|
| +
|
| RenderObject* sliderRenderer = m_parent->renderer();
|
| if (!sliderRenderer || !sliderRenderer->isSlider())
|
| return LayoutRect();
|
|
|