Switch all LayoutTests to use new accessibility relative bounding box API.

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

 /*
  * Copyright (C) 2012, 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:
  *
  * 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 1747 matching lines @@
         if (toLabelableElement(htmlElement)->labels() && toLabelableElement(htmlElement)->labels()->length() > 0)
             return true;
     }
 
     return false;
 }
 
 LayoutRect AXNodeObject::elementRect() const
 {
     // First check if it has a custom rect, for example if this element is tied to a canvas path.
-    if (!m_explicitElementRect.isEmpty())
-        return m_explicitElementRect;
+    if (!m_explicitElementRect.isEmpty()) {
+        LayoutRect bounds = m_explicitElementRect;
+        AXObject* canvas = axObjectCache().objectFromAXID(m_explicitContainerID);
+        if (canvas)
+            bounds.moveBy(canvas->elementRect().location());
+        return bounds;
+    }
 
     // FIXME: If there are a lot of elements in the canvas, it will be inefficient.
     // We can avoid the inefficient calculations by using AXComputedObjectAttributeCache.
     if (getNode()->parentElement()->isInCanvasSubtree()) {
         LayoutRect rect;
 
         for (Node& child : NodeTraversal::childrenOf(*getNode())) {
             if (child.isHTMLElement()) {
                 if (AXObject* obj = axObjectCache().get(&child)) {
                     if (rect.isEmpty())
@@ skipping 19 matching lines @@
             LayoutRect parentRect = positionProvider->elementRect();
             boundingBox.setSize(LayoutSize(parentRect.width(), LayoutUnit(std::min(10.0f, parentRect.height().toFloat()))));
             boundingBox.setLocation(parentRect.location());
             break;
         }
     }
 
     return boundingBox;
 }
 
+void AXNodeObject::getRelativeBounds(AXObject** outContainer, FloatRect& outBoundsInContainer, SkMatrix44& outContainerTransform) const
+{
+    *outContainer = nullptr;
+    outBoundsInContainer = FloatRect();
+    outContainerTransform.setIdentity();
+
+    // First check if it has a custom rect, for example if this element is tied to a canvas path.
+    if (!m_explicitElementRect.isEmpty()) {
+        *outContainer = axObjectCache().objectFromAXID(m_explicitContainerID);
+        if (*outContainer) {
+            outBoundsInContainer = FloatRect(m_explicitElementRect);
+            return;
+        }
+    }
+
+    // If it's in a canvas but doesn't have an explicit rect, get the bounding rect of its children.
+    if (getNode()->parentElement()->isInCanvasSubtree()) {
+        Vector<FloatRect> rects;
+        for (Node& child : NodeTraversal::childrenOf(*getNode())) {
+            if (child.isHTMLElement()) {
+                if (AXObject* obj = axObjectCache().get(&child)) {
+                    AXObject* container;
+                    FloatRect bounds;
+                    obj->getRelativeBounds(&container, bounds, outContainerTransform);
+                    if (container) {
+                        *outContainer = container;
+                        rects.append(bounds);
+                    }
+                }
+            }
+        }
+
+        if (*outContainer) {
+            outBoundsInContainer = unionRect(rects);
+            return;
+        }
+    }
+
+    // If this object doesn't have an explicit element rect or computable from its children,
+    // for now, let's return the position of the ancestor that does have a position,
+    // and make it the width of that parent, and about the height of a line of text, so that
+    // it's clear the object is a child of the parent.
+    for (AXObject* positionProvider = parentObject(); positionProvider; positionProvider = positionProvider->parentObject()) {
+        if (positionProvider->isAXLayoutObject()) {
+            positionProvider->getRelativeBounds(outContainer, outBoundsInContainer, outContainerTransform);
+            if (*outContainer)
+                outBoundsInContainer.setSize(FloatSize(outBoundsInContainer.width(), std::min(10.0f, outBoundsInContainer.height())));

[aboxhall, 2016/07/28 18:40:43]

Is there a test for this behaviour?

[dmazzoni, 2016/07/28 21:43:16]

Yes, this was covered by existing canvas accessibility tests.

+            break;
+        }
+    }
+}
+
 static Node* getParentNodeForComputeParent(Node* node)
 {
     if (!node)
         return nullptr;
 
     Node* parentNode = nullptr;
 
     // Skip over <optgroup> and consider the <select> the immediate parent of an <option>.
     if (isHTMLOptionElement(node))
         parentNode = toHTMLOptionElement(node)->ownerSelectElement();
@@ skipping 1022 matching lines @@
     return placeholder;
 }
 
 DEFINE_TRACE(AXNodeObject)
 {
     visitor->trace(m_node);
     AXObject::trace(visitor);
 }
 
 } // namespace blink