| Index: Source/core/accessibility/AccessibilityNodeObject.cpp
|
| diff --git a/Source/core/accessibility/AccessibilityNodeObject.cpp b/Source/core/accessibility/AccessibilityNodeObject.cpp
|
| index 6af3d644c2f85254f5ffe8377882038236587f59..becc0c1ac64a4c35d09a973715d1deaadf8be90b 100644
|
| --- a/Source/core/accessibility/AccessibilityNodeObject.cpp
|
| +++ b/Source/core/accessibility/AccessibilityNodeObject.cpp
|
| @@ -183,7 +183,7 @@ AccessibilityRole AccessibilityNodeObject::determineAccessibilityRole()
|
| if (node()->hasTagName(buttonTag))
|
| return buttonRoleType();
|
| if (node()->hasTagName(inputTag)) {
|
| - HTMLInputElement* input = static_cast<HTMLInputElement*>(node());
|
| + Handle<HTMLInputElement> input(static_cast<HTMLInputElement*>(node()));
|
| if (input->isCheckbox())
|
| return CheckBoxRole;
|
| if (input->isRadioButton())
|
| @@ -202,7 +202,7 @@ AccessibilityRole AccessibilityNodeObject::determineAccessibilityRole()
|
| return TextFieldRole;
|
| }
|
| if (node()->hasTagName(selectTag)) {
|
| - HTMLSelectElement* selectElement = toHTMLSelectElement(node());
|
| + Handle<HTMLSelectElement> selectElement = toHTMLSelectElement(node());
|
| return selectElement->multiple() ? ListBoxRole : PopUpButtonRole;
|
| }
|
| if (node()->hasTagName(textareaTag))
|
| @@ -534,7 +534,7 @@ bool AccessibilityNodeObject::isInputImage() const
|
| return false;
|
|
|
| if (roleValue() == ButtonRole && node->hasTagName(inputTag)) {
|
| - HTMLInputElement* input = static_cast<HTMLInputElement*>(node);
|
| + Handle<HTMLInputElement> input(static_cast<HTMLInputElement*>(node));
|
| return input->isImageButton();
|
| }
|
|
|
| @@ -596,7 +596,7 @@ bool AccessibilityNodeObject::isNativeCheckboxOrRadio() const
|
| if (!node)
|
| return false;
|
|
|
| - HTMLInputElement* input = node->toInputElement();
|
| + Handle<HTMLInputElement> input = node->toInputElement();
|
| if (input)
|
| return input->isCheckbox() || input->isRadioButton();
|
|
|
| @@ -616,7 +616,7 @@ bool AccessibilityNodeObject::isNativeImage() const
|
| return true;
|
|
|
| if (node->hasTagName(inputTag)) {
|
| - HTMLInputElement* input = static_cast<HTMLInputElement*>(node);
|
| + Handle<HTMLInputElement> input(static_cast<HTMLInputElement*>(node));
|
| return input->isImageButton();
|
| }
|
|
|
| @@ -633,7 +633,7 @@ bool AccessibilityNodeObject::isNativeTextControl() const
|
| return true;
|
|
|
| if (node->hasTagName(inputTag)) {
|
| - HTMLInputElement* input = static_cast<HTMLInputElement*>(node);
|
| + Handle<HTMLInputElement> input(static_cast<HTMLInputElement*>(node));
|
| return input->isText() || input->isNumberField();
|
| }
|
|
|
| @@ -649,7 +649,7 @@ bool AccessibilityNodeObject::isPasswordField() const
|
| if (ariaRoleAttribute() != UnknownRole)
|
| return false;
|
|
|
| - HTMLInputElement* inputElement = node->toInputElement();
|
| + Handle<HTMLInputElement> inputElement = node->toInputElement();
|
| if (!inputElement)
|
| return false;
|
|
|
| @@ -667,7 +667,7 @@ bool AccessibilityNodeObject::isSearchField() const
|
| if (!node)
|
| return false;
|
|
|
| - HTMLInputElement* inputElement = node->toInputElement();
|
| + Handle<HTMLInputElement> inputElement = node->toInputElement();
|
| if (!inputElement)
|
| return false;
|
|
|
| @@ -703,7 +703,7 @@ bool AccessibilityNodeObject::isChecked() const
|
| return false;
|
|
|
| // First test for native checkedness semantics
|
| - HTMLInputElement* inputElement = node->toInputElement();
|
| + Handle<HTMLInputElement> inputElement = node->toInputElement();
|
| if (inputElement)
|
| return inputElement->shouldAppearChecked();
|
|
|
| @@ -737,7 +737,7 @@ bool AccessibilityNodeObject::isIndeterminate() const
|
| if (!node)
|
| return false;
|
|
|
| - HTMLInputElement* inputElement = node->toInputElement();
|
| + Handle<HTMLInputElement> inputElement = node->toInputElement();
|
| if (!inputElement)
|
| return false;
|
|
|
| @@ -773,7 +773,7 @@ bool AccessibilityNodeObject::isReadOnly() const
|
| return static_cast<HTMLTextAreaElement*>(node)->isReadOnly();
|
|
|
| if (node->hasTagName(inputTag)) {
|
| - HTMLInputElement* input = static_cast<HTMLInputElement*>(node);
|
| + Handle<HTMLInputElement> input(static_cast<HTMLInputElement*>(node));
|
| if (input->isTextField())
|
| return input->isReadOnly();
|
| }
|
| @@ -936,7 +936,7 @@ void AccessibilityNodeObject::colorValue(int& r, int& g, int& b) const
|
| if (!node() || !node()->hasTagName(inputTag))
|
| return;
|
|
|
| - HTMLInputElement* input = static_cast<HTMLInputElement*>(node());
|
| + Handle<HTMLInputElement> input(static_cast<HTMLInputElement*>(node()));
|
| const AtomicString& type = input->getAttribute(typeAttr);
|
| if (!equalIgnoringCase(type, "color"))
|
| return;
|
| @@ -959,7 +959,7 @@ String AccessibilityNodeObject::valueDescription() const
|
| float AccessibilityNodeObject::valueForRange() const
|
| {
|
| if (node() && node()->hasTagName(inputTag)) {
|
| - HTMLInputElement* input = static_cast<HTMLInputElement*>(node());
|
| + Handle<HTMLInputElement> input(static_cast<HTMLInputElement*>(node()));
|
| if (input->isRangeControl())
|
| return input->valueAsNumber();
|
| }
|
| @@ -973,7 +973,7 @@ float AccessibilityNodeObject::valueForRange() const
|
| float AccessibilityNodeObject::maxValueForRange() const
|
| {
|
| if (node() && node()->hasTagName(inputTag)) {
|
| - HTMLInputElement* input = static_cast<HTMLInputElement*>(node());
|
| + Handle<HTMLInputElement> input(static_cast<HTMLInputElement*>(node()));
|
| if (input->isRangeControl())
|
| return input->maximum();
|
| }
|
| @@ -987,7 +987,7 @@ float AccessibilityNodeObject::maxValueForRange() const
|
| float AccessibilityNodeObject::minValueForRange() const
|
| {
|
| if (node() && node()->hasTagName(inputTag)) {
|
| - HTMLInputElement* input = static_cast<HTMLInputElement*>(node());
|
| + Handle<HTMLInputElement> input(static_cast<HTMLInputElement*>(node()));
|
| if (input->isRangeControl())
|
| return input->minimum();
|
| }
|
| @@ -1056,7 +1056,7 @@ String AccessibilityNodeObject::stringValue() const
|
| return textUnderElement();
|
|
|
| if (node->hasTagName(selectTag)) {
|
| - HTMLSelectElement* selectElement = toHTMLSelectElement(node);
|
| + Handle<HTMLSelectElement> selectElement = toHTMLSelectElement(node);
|
| int selectedIndex = selectElement->selectedIndex();
|
| const Vector<HTMLElement*> listItems = selectElement->listItems();
|
| if (selectedIndex >= 0 && static_cast<size_t>(selectedIndex) < listItems.size()) {
|
| @@ -1207,7 +1207,7 @@ String AccessibilityNodeObject::title() const
|
|
|
| bool isInputTag = node->hasTagName(inputTag);
|
| if (isInputTag) {
|
| - HTMLInputElement* input = static_cast<HTMLInputElement*>(node);
|
| + Handle<HTMLInputElement> input(static_cast<HTMLInputElement*>(node));
|
| if (input->isTextButton())
|
| return input->valueWithDefault();
|
| }
|
| @@ -1463,9 +1463,9 @@ Element* AccessibilityNodeObject::actionElement() const
|
| return 0;
|
|
|
| if (node->hasTagName(inputTag)) {
|
| - HTMLInputElement* input = static_cast<HTMLInputElement*>(node);
|
| + Handle<HTMLInputElement> input(static_cast<HTMLInputElement*>(node));
|
| if (!input->isDisabledFormControl() && (isCheckboxOrRadio() || input->isTextButton()))
|
| - return input;
|
| + return input.raw();
|
| } else if (node->hasTagName(buttonTag))
|
| return toElement(node);
|
|
|
| @@ -1740,7 +1740,7 @@ void AccessibilityNodeObject::visibleText(Vector<AccessibilityText>& textOrder)
|
|
|
| bool isInputTag = node->hasTagName(inputTag);
|
| if (isInputTag) {
|
| - HTMLInputElement* input = static_cast<HTMLInputElement*>(node);
|
| + Handle<HTMLInputElement> input(static_cast<HTMLInputElement*>(node));
|
| if (input->isTextButton()) {
|
| textOrder.append(AccessibilityText(input->valueWithDefault(), VisibleText));
|
| return;
|
|
|