Get rid of remaining uses of AXObject::elementRect

third_party/WebKit/Source/web/WebAXObject.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 636 matching lines @@
 {
     // aria-owns rearranges the accessibility tree rather than just
     // exposing an attribute.
 
     // FIXME(dmazzoni): remove this function after we stop calling it
     // from Chromium.  http://crbug.com/489590
 
     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())
         return WebString();
 
     return m_private->fontFamily();
 }
 
 float WebAXObject::fontSize() const
 {
     if (isDetached())
         return 0.0f;
 
     return m_private->fontSize();
 }
 
 bool WebAXObject::canvasHasFallbackContent() const
 {
     if (isDetached())
         return false;
 
     return m_private->canvasHasFallbackContent();
 }
 
-WebPoint WebAXObject::clickPoint() const
-{
-    if (isDetached())
-        return WebPoint();
-
-    return WebPoint(m_private->clickPoint());
-}
-
 WebAXInvalidState WebAXObject::invalidState() const
 {
     if (isDetached())
         return WebAXInvalidStateUndefined;
 
     return static_cast<WebAXInvalidState>(m_private->getInvalidState());
 }
 
 // Only used when invalidState() returns WebAXInvalidStateOther.
 WebString WebAXObject::ariaInvalidValue() const
@@ skipping 35 matching lines @@
 {
     if (isDetached())
         return WebAXObject();
 
     IntPoint contentsPoint = m_private->documentFrameView()->soonToBeRemovedUnscaledViewportToContents(point);
     AXObject* hit = m_private->accessibilityHitTest(contentsPoint);
 
     if (hit)
         return WebAXObject(hit);
 
-    if (m_private->elementRect().contains(contentsPoint))
+    if (m_private->getBoundsInFrameCoordinates().contains(contentsPoint))
         return *this;
 
     return WebAXObject();
 }
 
 WebString WebAXObject::keyboardShortcut() const
 {
     if (isDetached())
         return WebString();
 
@@ skipping 814 matching lines @@
     if (!isDetached())
         m_private->scrollToMakeVisibleWithSubFocus(subfocus);
 }
 
 void WebAXObject::scrollToGlobalPoint(const WebPoint& point) const
 {
     if (!isDetached())
         m_private->scrollToGlobalPoint(point);
 }
 
-SkMatrix44 WebAXObject::transformFromLocalParentFrame() const
-{
-    if (isDetached())
-        return SkMatrix44();
-
-    return m_private->transformFromLocalParentFrame();
-}
-
 WebAXObject::WebAXObject(AXObject* object)
     : m_private(object)
 {
 }
 
 WebAXObject& WebAXObject::operator=(AXObject* object)
 {
     m_private = object;
     return *this;
 }
 
 WebAXObject::operator AXObject*() const
 {
     return m_private.get();
 }
 
 } // namespace blink