Spatial Navigation: Make non-SVG elements with event listener not focusable.

Source/core/dom/Element.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
  *           (C) 2007 Eric Seidel (eric@webkit.org)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 2199 matching lines @@
 bool Element::supportsSpatialNavigationFocus() const
 {
     // This function checks whether the element satisfies the extended criteria
     // for the element to be focusable, introduced by spatial navigation feature,
     // i.e. checks if click or keyboard event handler is specified.
     // This is the way to make it possible to navigate to (focus) elements
     // which web designer meant for being active (made them respond to click events).
 
     if (!isSpatialNavigationEnabled(document().frame()))
         return false;
-    if (hasEventListeners(EventTypeNames::click)
+    if (!isSVGElement())
+        return false;
+    return hasEventListeners(EventTypeNames::click)
         || hasEventListeners(EventTypeNames::keydown)
         || hasEventListeners(EventTypeNames::keypress)
-        || hasEventListeners(EventTypeNames::keyup))
-        return true;
-    if (!isSVGElement())
-        return false;
-    return (hasEventListeners(EventTypeNames::focus)
+        || hasEventListeners(EventTypeNames::keyup)
+        || hasEventListeners(EventTypeNames::focus)
         || hasEventListeners(EventTypeNames::blur)
         || hasEventListeners(EventTypeNames::focusin)
-        || hasEventListeners(EventTypeNames::focusout));
+        || hasEventListeners(EventTypeNames::focusout);
 }
 
 bool Element::isFocusable() const
 {
     return inDocument() && supportsFocus() && !isInert() && rendererIsFocusable();
 }
 
 bool Element::isKeyboardFocusable() const
 {
     return isFocusable() && tabIndex() >= 0;
@@ skipping 1163 matching lines @@
         return wrapper;
 
     CustomElementBinding* binding = perContextData->customElementBinding(customElementDefinition());
 
     wrapper->SetPrototype(binding->prototype());
 
     return V8DOMWrapper::associateObjectWithWrapper(isolate, this, wrapperType, wrapper);
 }
 
 } // namespace blink