| Index: Source/core/accessibility/AccessibilityRenderObject.cpp
|
| diff --git a/Source/core/accessibility/AccessibilityRenderObject.cpp b/Source/core/accessibility/AccessibilityRenderObject.cpp
|
| index ac9835dba4f05f0e80e3f1aa7a6ef16bd7aca0f1..981f3433fc2074db4067bd831b0ecfdb73648f32 100644
|
| --- a/Source/core/accessibility/AccessibilityRenderObject.cpp
|
| +++ b/Source/core/accessibility/AccessibilityRenderObject.cpp
|
| @@ -474,7 +474,7 @@ bool AccessibilityRenderObject::isAttachment() const
|
| bool AccessibilityRenderObject::isFileUploadButton() const
|
| {
|
| if (m_renderer && m_renderer->node() && m_renderer->node()->hasTagName(inputTag)) {
|
| - HTMLInputElement* input = static_cast<HTMLInputElement*>(m_renderer->node());
|
| + Handle<HTMLInputElement> input(static_cast<HTMLInputElement*>(m_renderer->node()));
|
| return input->isFileUpload();
|
| }
|
|
|
| @@ -642,7 +642,7 @@ String AccessibilityRenderObject::stringValue() const
|
| if (cssBox && cssBox->isMenuList()) {
|
| // RenderMenuList will go straight to the text() of its selected item.
|
| // This has to be overridden in the case where the selected item has an ARIA label.
|
| - HTMLSelectElement* selectElement = toHTMLSelectElement(m_renderer->node());
|
| + Handle<HTMLSelectElement> selectElement = toHTMLSelectElement(m_renderer->node());
|
| int selectedIndex = selectElement->selectedIndex();
|
| const Vector<HTMLElement*> listItems = selectElement->listItems();
|
| if (selectedIndex >= 0 && static_cast<size_t>(selectedIndex) < listItems.size()) {
|
| @@ -833,7 +833,7 @@ void AccessibilityRenderObject::addRadioButtonGroupMembers(AccessibilityChildren
|
| if (!node || !node->hasTagName(inputTag))
|
| return;
|
|
|
| - HTMLInputElement* input = static_cast<HTMLInputElement*>(node);
|
| + Handle<HTMLInputElement> input(static_cast<HTMLInputElement*>(node));
|
| // if there's a form, then this is easy
|
| if (input->form()) {
|
| Vector<RefPtr<Node> > formElements;
|
| @@ -850,9 +850,9 @@ void AccessibilityRenderObject::addRadioButtonGroupMembers(AccessibilityChildren
|
| unsigned len = list->length();
|
| for (unsigned i = 0; i < len; ++i) {
|
| if (list->item(i)->hasTagName(inputTag)) {
|
| - HTMLInputElement* associateElement = static_cast<HTMLInputElement*>(list->item(i));
|
| + Handle<HTMLInputElement> associateElement(static_cast<HTMLInputElement*>(list->item(i)));
|
| if (associateElement->isRadioButton() && associateElement->name() == input->name()) {
|
| - if (AccessibilityObject* object = axObjectCache()->getOrCreate(associateElement))
|
| + if (AccessibilityObject* object = axObjectCache()->getOrCreate(associateElement.raw()))
|
| linkedUIElements.append(object);
|
| }
|
| }
|
| @@ -1274,7 +1274,7 @@ String AccessibilityRenderObject::selectedText() const
|
| return String(); // need to return something distinct from empty string
|
|
|
| if (isNativeTextControl()) {
|
| - HTMLTextFormControlElement* textControl = toRenderTextControl(m_renderer)->textFormControlElement();
|
| + Handle<HTMLTextFormControlElement> textControl = toRenderTextControl(m_renderer)->textFormControlElement();
|
| return textControl->selectedText();
|
| }
|
|
|
| @@ -1308,7 +1308,7 @@ PlainTextRange AccessibilityRenderObject::selectedTextRange() const
|
|
|
| AccessibilityRole ariaRole = ariaRoleAttribute();
|
| if (isNativeTextControl() && ariaRole == UnknownRole) {
|
| - HTMLTextFormControlElement* textControl = toRenderTextControl(m_renderer)->textFormControlElement();
|
| + Handle<HTMLTextFormControlElement> textControl = toRenderTextControl(m_renderer)->textFormControlElement();
|
| return PlainTextRange(textControl->selectionStart(), textControl->selectionEnd() - textControl->selectionStart());
|
| }
|
|
|
| @@ -1321,7 +1321,7 @@ PlainTextRange AccessibilityRenderObject::selectedTextRange() const
|
| void AccessibilityRenderObject::setSelectedTextRange(const PlainTextRange& range)
|
| {
|
| if (isNativeTextControl()) {
|
| - HTMLTextFormControlElement* textControl = toRenderTextControl(m_renderer)->textFormControlElement();
|
| + Handle<HTMLTextFormControlElement> textControl = toRenderTextControl(m_renderer)->textFormControlElement();
|
| textControl->setSelectionRange(range.start, range.start + range.length);
|
| return;
|
| }
|
| @@ -1682,7 +1682,7 @@ VisiblePosition AccessibilityRenderObject::visiblePositionForIndex(int index) co
|
| int AccessibilityRenderObject::indexForVisiblePosition(const VisiblePosition& pos) const
|
| {
|
| if (isNativeTextControl()) {
|
| - HTMLTextFormControlElement* textControl = toRenderTextControl(m_renderer)->textFormControlElement();
|
| + Handle<HTMLTextFormControlElement> textControl = toRenderTextControl(m_renderer)->textFormControlElement();
|
| return textControl->indexForVisiblePosition(pos);
|
| }
|
|
|
| @@ -2017,7 +2017,7 @@ AccessibilityObject* AccessibilityRenderObject::accessibilityHitTest(const IntPo
|
| return accessibilityImageMapHitTest(static_cast<HTMLAreaElement*>(node), point);
|
|
|
| if (node->hasTagName(optionTag))
|
| - node = static_cast<HTMLOptionElement*>(node)->ownerSelectElement();
|
| + node = Handle<HTMLSelectElement>(static_cast<HTMLOptionElement*>(node)->ownerSelectElement()).raw();
|
|
|
| RenderObject* obj = node->renderer();
|
| if (!obj)
|
| @@ -2280,7 +2280,7 @@ AccessibilityRole AccessibilityRenderObject::determineAccessibilityRole()
|
| return TextAreaRole;
|
|
|
| if (node && node->hasTagName(inputTag)) {
|
| - HTMLInputElement* input = static_cast<HTMLInputElement*>(node);
|
| + Handle<HTMLInputElement> input(static_cast<HTMLInputElement*>(node));
|
| if (input->isCheckbox())
|
| return CheckBoxRole;
|
| if (input->isRadioButton())
|
| @@ -2559,7 +2559,7 @@ void AccessibilityRenderObject::addTextFieldChildren()
|
| if (!node || !node->hasTagName(inputTag))
|
| return;
|
|
|
| - HTMLInputElement* input = static_cast<HTMLInputElement*>(node);
|
| + Handle<HTMLInputElement> input(static_cast<HTMLInputElement*>(node));
|
| HTMLElement* spinButtonElement = input->innerSpinButtonElement();
|
| if (!spinButtonElement || !spinButtonElement->isSpinButtonElement())
|
| return;
|
|
|