Get rid of remaining uses of AXObject::elementRect

third_party/WebKit/Source/modules/accessibility/AXSpinButton.cpp

 /*
  * Copyright (C) 2011 Apple 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 34 matching lines @@
 {
     ASSERT(!m_spinButtonElement);
 }
 
 DEFINE_TRACE(AXSpinButton)
 {
     visitor->trace(m_spinButtonElement);
     AXMockObject::trace(visitor);
 }
 
-LayoutRect AXSpinButton::elementRect() const
+LayoutObject* AXSpinButton::layoutObjectForRelativeBounds() const
 {
     if (!m_spinButtonElement || !m_spinButtonElement->layoutObject())
-        return LayoutRect();
+        return nullptr;
 
-    return LayoutRect(m_spinButtonElement->layoutObject()->absoluteElementBoundingBoxRect());
+    return m_spinButtonElement->layoutObject();
 }
 
 void AXSpinButton::detach()
 {
     AXObject::detach();
     m_spinButtonElement = nullptr;
 }
 
 void AXSpinButton::detachFromParent()
 {
@@ skipping 37 matching lines @@
     : AXMockObject(axObjectCache)
     , m_isIncrementor(false)
 {
 }
 
 AXSpinButtonPart* AXSpinButtonPart::create(AXObjectCacheImpl& axObjectCache)
 {
     return new AXSpinButtonPart(axObjectCache);
 }
 
-LayoutRect AXSpinButtonPart::elementRect() const
+void AXSpinButtonPart::getRelativeBounds(AXObject** outContainer, FloatRect& outBoundsInContainer, SkMatrix44& outContainerTransform) const
 {
+    *outContainer = nullptr;
+    outBoundsInContainer = FloatRect();
+    outContainerTransform.setIdentity();
+
+    if (!parentObject())
+        return;
+
     // FIXME: This logic should exist in the layout tree or elsewhere, but there is no

[aboxhall, 2016/08/26 22:44:46]

Is this FIXME still current?

[dmazzoni, 2016/08/29 23:17:06]

Yes - we're just dividing the height in half to get the
upper vs lower spin button part. It'd be nice if there
was an API for this but it seems pretty unlikely to break.

     // relationship that exists that can be queried.
-
-    LayoutRect parentRect = parentObject()->elementRect();
+    parentObject()->getRelativeBounds(outContainer, outBoundsInContainer, outContainerTransform);
+    outBoundsInContainer = FloatRect(0, 0, outBoundsInContainer.width(), outBoundsInContainer.height());
     if (m_isIncrementor) {
-        parentRect.setHeight(parentRect.height() / 2);
+        outBoundsInContainer.setHeight(outBoundsInContainer.height() / 2);
     } else {
-        parentRect.setY(parentRect.y() + parentRect.height() / 2);
-        parentRect.setHeight(parentRect.height() / 2);
+        outBoundsInContainer.setY(outBoundsInContainer.y() + outBoundsInContainer.height() / 2);
+        outBoundsInContainer.setHeight(outBoundsInContainer.height() / 2);
     }
-
-    return parentRect;
+    *outContainer = parentObject();
 }
 
 bool AXSpinButtonPart::press() const
 {
     if (!m_parent || !m_parent->isSpinButton())
         return false;
 
     AXSpinButton* spinButton = toAXSpinButton(parentObject());
     if (m_isIncrementor)
         spinButton->step(1);
     else
         spinButton->step(-1);
 
     return true;
 }
 
 } // namespace blink