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

Source/core/dom/Element.cpp

Index: Source/core/dom/Element.cpp
diff --git a/Source/core/dom/Element.cpp b/Source/core/dom/Element.cpp
index 95d6824d5e7e8884895744412924fe18f00ce21b..9a45e5bfec20e85e68b93ed8698337fe6ceab9e9 100644
--- a/Source/core/dom/Element.cpp
+++ b/Source/core/dom/Element.cpp
@@ -2217,17 +2217,16 @@ bool Element::supportsSpatialNavigationFocus() const
 
     if (!isSpatialNavigationEnabled(document().frame()))
         return false;
-    if (hasEventListeners(EventTypeNames::click)
-        || hasEventListeners(EventTypeNames::keydown)
-        || hasEventListeners(EventTypeNames::keypress)
-        || hasEventListeners(EventTypeNames::keyup))
-        return true;
     if (!isSVGElement())
         return false;
-    return (hasEventListeners(EventTypeNames::focus)
+    return hasEventListeners(EventTypeNames::click)
+        || hasEventListeners(EventTypeNames::keydown)
+        || hasEventListeners(EventTypeNames::keypress)
+        || hasEventListeners(EventTypeNames::keyup)
+        || hasEventListeners(EventTypeNames::focus)
         || hasEventListeners(EventTypeNames::blur)
         || hasEventListeners(EventTypeNames::focusin)
-        || hasEventListeners(EventTypeNames::focusout));
+        || hasEventListeners(EventTypeNames::focusout);
 }
 
 bool Element::isFocusable() const