| Index: Source/core/accessibility/AccessibilitySpinButton.cpp
|
| diff --git a/Source/core/accessibility/AccessibilitySpinButton.cpp b/Source/core/accessibility/AccessibilitySpinButton.cpp
|
| index 7b42e3498d591a987be2c71d3289b8e00f3bd922..427b7a11d305f025eed0aa60a487c811eee2092b 100644
|
| --- a/Source/core/accessibility/AccessibilitySpinButton.cpp
|
| +++ b/Source/core/accessibility/AccessibilitySpinButton.cpp
|
| @@ -35,7 +35,7 @@ PassRefPtr<AccessibilitySpinButton> AccessibilitySpinButton::create()
|
| {
|
| return adoptRef(new AccessibilitySpinButton);
|
| }
|
| -
|
| +
|
| AccessibilitySpinButton::AccessibilitySpinButton()
|
| : m_spinButtonElement(0)
|
| {
|
| @@ -44,14 +44,14 @@ AccessibilitySpinButton::AccessibilitySpinButton()
|
| AccessibilitySpinButton::~AccessibilitySpinButton()
|
| {
|
| }
|
| -
|
| +
|
| LayoutRect AccessibilitySpinButton::elementRect() const
|
| {
|
| ASSERT(m_spinButtonElement);
|
| -
|
| +
|
| if (!m_spinButtonElement || !m_spinButtonElement->renderer())
|
| return LayoutRect();
|
| -
|
| +
|
| Vector<FloatQuad> quads;
|
| m_spinButtonElement->renderer()->absoluteFocusRingQuads(quads);
|
|
|
| @@ -61,7 +61,7 @@ LayoutRect AccessibilitySpinButton::elementRect() const
|
| void AccessibilitySpinButton::addChildren()
|
| {
|
| m_haveChildren = true;
|
| -
|
| +
|
| AccessibilitySpinButtonPart* incrementor = static_cast<AccessibilitySpinButtonPart*>(axObjectCache()->getOrCreate(SpinButtonPartRole));
|
| incrementor->setIsIncrementor(true);
|
| incrementor->setParent(this);
|
| @@ -72,23 +72,23 @@ void AccessibilitySpinButton::addChildren()
|
| decrementor->setParent(this);
|
| m_children.append(decrementor);
|
| }
|
| -
|
| +
|
| void AccessibilitySpinButton::step(int amount)
|
| {
|
| ASSERT(m_spinButtonElement);
|
| if (!m_spinButtonElement)
|
| return;
|
| -
|
| +
|
| m_spinButtonElement->step(amount);
|
| }
|
|
|
| -// AccessibilitySpinButtonPart
|
| +// AccessibilitySpinButtonPart
|
|
|
| AccessibilitySpinButtonPart::AccessibilitySpinButtonPart()
|
| : m_isIncrementor(false)
|
| {
|
| }
|
| -
|
| +
|
| PassRefPtr<AccessibilitySpinButtonPart> AccessibilitySpinButtonPart::create()
|
| {
|
| return adoptRef(new AccessibilitySpinButtonPart);
|
| @@ -98,15 +98,15 @@ LayoutRect AccessibilitySpinButtonPart::elementRect() const
|
| {
|
| // FIXME: This logic should exist in the render tree or elsewhere, but there is no
|
| // relationship that exists that can be queried.
|
| -
|
| +
|
| LayoutRect parentRect = parentObject()->elementRect();
|
| if (m_isIncrementor)
|
| parentRect.setHeight(parentRect.height() / 2);
|
| else {
|
| - parentRect.setY(parentRect.y() + parentRect.height() / 2);
|
| - parentRect.setHeight(parentRect.height() / 2);
|
| + parentRect.setY(parentRect.y() + parentRect.height() / 2);
|
| + parentRect.setHeight(parentRect.height() / 2);
|
| }
|
| -
|
| +
|
| return parentRect;
|
| }
|
|
|
| @@ -114,13 +114,13 @@ bool AccessibilitySpinButtonPart::press() const
|
| {
|
| if (!m_parent || !m_parent->isSpinButton())
|
| return false;
|
| -
|
| +
|
| AccessibilitySpinButton* spinButton = toAccessibilitySpinButton(parentObject());
|
| if (m_isIncrementor)
|
| spinButton->step(1);
|
| else
|
| spinButton->step(-1);
|
| -
|
| +
|
| return true;
|
| }
|
|
|
|
|