stop gap to help with elementFromPoint not being completely reliable

adding test where child element gets parent element chosen instead by elementFromPoint

common/src/web/click_tests/html5_submit_buttons.html

@@ -8,8 +8,9 @@
 <label for="name">Enter your name: </label><input type="text" name="name" id="name"/>
 <button id="internal_explicit_submit" type="submit">Explicit Submit</button>
 <button id="internal_implicit_submit">Implicit Submit</button>
+<button type="submit"><span id="internal_span_submit">Spanned Submit</span></button>
 </form>
 <button id="external_explicit_submit" type="submit" form="form1">Explicit Submit</button>
 <button id="external_implicit_submit" form="form1">Implicit Submit</button>
 </body>
-</html>
+</html>

java/client/test/org/openqa/selenium/FormHandlingTest.java

@@ -280,6 +280,13 @@ public void testCanClickOnASubmitButton() {
     checkSubmitButton("internal_explicit_submit");
   }
 
+
+  @Ignore(value = {SAFARI}, reason = "untested")
+  @Test
+  public void testCanClickOnASubmitButtonNestedSpan() {
+    checkSubmitButton("internal_span_submit");
+  }
+
   @Ignore(value = {SAFARI}, reason = "untested")
   @Test
   public void testCanClickOnAnImplicitSubmitButton() {

javascript/firefox-driver/js/syntheticMouse.js

@@ -173,6 +173,19 @@ SyntheticMouse.prototype.isElementClickable = function(element) {
     parentElemIter = parentElemIter.parentNode;
   }
 
+  // elementFromPoint is not without fault, for example:
+  // <button><span></button> and span.click() results in
+  // elementAtPoint being the button rather than the span.
+  // catch these potential edge cases by checking if the
+  // target element is a direct descendent of the elementAtPoint
+  parentElemIter = element.parentNode;
+  while (parentElemIter) {
+    if (parentElemIter == elementAtPoint) {
+      return;
+    }
+    parentElemIter = parentElemIter.parentNode;
+  }
+
   var elementAtPointHTML =
     elementAtPoint.outerHTML.replace(elementAtPoint.innerHTML, '');
 

javascript/firefox-driver/js/utils.js

@@ -723,6 +723,18 @@ Utils.getClickablePoint = function(element) {
       }
       parentElemIter = parentElemIter.parentNode;
     }
+
+    // elementFromPoint does not appear to be reliable. This will catch
+    // other cases where the parent element is found instead.
+    // ex.  <button><span/><button>, click on span, but elementFromPoint
+    //      returned the button element.
+    parentElemIter = element.parentNode;
+    while (parentElemIter) {
+      if (parentElemIter == elementAtPoint) {
+        return true;
+      }
+      parentElemIter = parentElemIter.parentNode;
+    }
   };
 
   var rectPointRelativeToView = function(x, y, r) {