| Index: third_party/WebKit/Source/web/WebAXObject.cpp
|
| diff --git a/third_party/WebKit/Source/web/WebAXObject.cpp b/third_party/WebKit/Source/web/WebAXObject.cpp
|
| index f9aeac1aae2cbd8b96c8a5fc34214902f00b5e9e..949c6905dc685cfda1ae0551ccb45acfc362d839 100644
|
| --- a/third_party/WebKit/Source/web/WebAXObject.cpp
|
| +++ b/third_party/WebKit/Source/web/WebAXObject.cpp
|
| @@ -992,120 +992,6 @@ WebURL WebAXObject::url() const
|
| return m_private->url();
|
| }
|
|
|
| -WebString WebAXObject::deprecatedAccessibilityDescription() const
|
| -{
|
| - if (isDetached())
|
| - return WebString();
|
| -
|
| - ASSERT(isLayoutClean(m_private->document()));
|
| -
|
| - return m_private->deprecatedAccessibilityDescription();
|
| -}
|
| -
|
| -bool WebAXObject::deprecatedAriaDescribedby(WebVector<WebAXObject>& describedbyElements) const
|
| -{
|
| - if (isDetached())
|
| - return false;
|
| -
|
| - AXObject::AXObjectVector describedby;
|
| - m_private->deprecatedAriaDescribedbyElements(describedby);
|
| -
|
| - WebVector<WebAXObject> result(describedby.size());
|
| - for (size_t i = 0; i < describedby.size(); i++)
|
| - result[i] = WebAXObject(describedby[i]);
|
| - describedbyElements.swap(result);
|
| -
|
| - return true;
|
| -}
|
| -
|
| -bool WebAXObject::deprecatedAriaLabelledby(WebVector<WebAXObject>& labelledbyElements) const
|
| -{
|
| - if (isDetached())
|
| - return false;
|
| -
|
| - AXObject::AXObjectVector labelledby;
|
| - m_private->deprecatedAriaLabelledbyElements(labelledby);
|
| -
|
| - WebVector<WebAXObject> result(labelledby.size());
|
| - for (size_t i = 0; i < labelledby.size(); i++)
|
| - result[i] = WebAXObject(labelledby[i]);
|
| - labelledbyElements.swap(result);
|
| -
|
| - return true;
|
| -}
|
| -
|
| -WebString WebAXObject::deprecatedHelpText() const
|
| -{
|
| - if (isDetached())
|
| - return WebString();
|
| -
|
| - return m_private->deprecatedHelpText();
|
| -}
|
| -
|
| -WebString WebAXObject::deprecatedPlaceholder() const
|
| -{
|
| - if (isDetached())
|
| - return WebString();
|
| -
|
| - return WebString(m_private->deprecatedPlaceholder());
|
| -}
|
| -
|
| -WebString WebAXObject::deprecatedTitle() const
|
| -{
|
| - if (isDetached())
|
| - return WebString();
|
| -
|
| - ASSERT(isLayoutClean(m_private->document()));
|
| -
|
| - return m_private->deprecatedTitle();
|
| -}
|
| -
|
| -WebAXObject WebAXObject::deprecatedTitleUIElement() const
|
| -{
|
| - if (isDetached())
|
| - return WebAXObject();
|
| -
|
| - if (!m_private->deprecatedExposesTitleUIElement())
|
| - return WebAXObject();
|
| -
|
| - return WebAXObject(m_private->deprecatedTitleUIElement());
|
| -}
|
| -
|
| -WebString WebAXObject::accessibilityDescription() const
|
| -{
|
| - return deprecatedAccessibilityDescription();
|
| -}
|
| -
|
| -bool WebAXObject::ariaDescribedby(WebVector<WebAXObject>& describedbyElements) const
|
| -{
|
| - return deprecatedAriaDescribedby(describedbyElements);
|
| -}
|
| -
|
| -bool WebAXObject::ariaLabelledby(WebVector<WebAXObject>& labelledbyElements) const
|
| -{
|
| - return deprecatedAriaLabelledby(labelledbyElements);
|
| -}
|
| -
|
| -WebString WebAXObject::helpText() const
|
| -{
|
| - return deprecatedHelpText();
|
| -}
|
| -
|
| -WebString WebAXObject::placeholder() const
|
| -{
|
| - return deprecatedPlaceholder();
|
| -}
|
| -
|
| -WebString WebAXObject::title() const
|
| -{
|
| - return deprecatedTitle();
|
| -}
|
| -
|
| -WebAXObject WebAXObject::titleUIElement() const
|
| -{
|
| - return deprecatedTitleUIElement();
|
| -}
|
| -
|
| WebString WebAXObject::name(WebAXNameFrom& outNameFrom, WebVector<WebAXObject>& outNameObjects) const
|
| {
|
| if (isDetached())
|
|
|