| 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 cc003cbf6c96746a41e1f66170e19a53952e7f00..ae65647dc1fbfb8915b4a39ce4a32be7d5a0281f 100644
|
| --- a/third_party/WebKit/Source/web/WebAXObject.cpp
|
| +++ b/third_party/WebKit/Source/web/WebAXObject.cpp
|
| @@ -654,18 +654,6 @@ bool WebAXObject::ariaOwns(WebVector<WebAXObject>& ownsElements) const
|
| return false;
|
| }
|
|
|
| -WebRect WebAXObject::boundingBoxRect() const
|
| -{
|
| - if (isDetached())
|
| - return WebRect();
|
| -
|
| -#if DCHECK_IS_ON()
|
| - DCHECK(isLayoutClean(m_private->getDocument()));
|
| -#endif
|
| -
|
| - return pixelSnappedIntRect(m_private->elementRect());
|
| -}
|
| -
|
| WebString WebAXObject::fontFamily() const
|
| {
|
| if (isDetached())
|
| @@ -690,14 +678,6 @@ bool WebAXObject::canvasHasFallbackContent() const
|
| return m_private->canvasHasFallbackContent();
|
| }
|
|
|
| -WebPoint WebAXObject::clickPoint() const
|
| -{
|
| - if (isDetached())
|
| - return WebPoint();
|
| -
|
| - return WebPoint(m_private->clickPoint());
|
| -}
|
| -
|
| WebAXInvalidState WebAXObject::invalidState() const
|
| {
|
| if (isDetached())
|
| @@ -753,7 +733,7 @@ WebAXObject WebAXObject::hitTest(const WebPoint& point) const
|
| if (hit)
|
| return WebAXObject(hit);
|
|
|
| - if (m_private->elementRect().contains(contentsPoint))
|
| + if (m_private->getBoundsInFrameCoordinates().contains(contentsPoint))
|
| return *this;
|
|
|
| return WebAXObject();
|
| @@ -1588,14 +1568,6 @@ void WebAXObject::scrollToGlobalPoint(const WebPoint& point) const
|
| m_private->scrollToGlobalPoint(point);
|
| }
|
|
|
| -SkMatrix44 WebAXObject::transformFromLocalParentFrame() const
|
| -{
|
| - if (isDetached())
|
| - return SkMatrix44();
|
| -
|
| - return m_private->transformFromLocalParentFrame();
|
| -}
|
| -
|
| WebAXObject::WebAXObject(AXObject* object)
|
| : m_private(object)
|
| {
|
|
|