Diff
Modified: trunk/LayoutTests/ChangeLog (248982 => 248983)
--- trunk/LayoutTests/ChangeLog 2019-08-22 00:24:54 UTC (rev 248982)
+++ trunk/LayoutTests/ChangeLog 2019-08-22 00:34:48 UTC (rev 248983)
@@ -1,3 +1,20 @@
+2019-08-21 Ryosuke Niwa <rn...@webkit.org>
+
+ SVG element should become focusable when focus and key event listeners are added
+ https://bugs.webkit.org/show_bug.cgi?id=200997
+
+ Reviewed by Said Abou-Hallawa.
+
+ Updated existing tests to set tabIndex where appropriate, and added SVG elements
+ without tabindex content attribute to tabindex-order.html so that the test would
+ skip those elements when sequentially focus navigating across them.
+
+ * svg/custom/add-event-listener-shadow-tree-element.html:
+ * svg/custom/resources/focus-event-handling-keyboard.js:
+ * svg/custom/resources/focus-event-handling.js:
+ * svg/custom/tabindex-order-expected.txt:
+ * svg/custom/tabindex-order.html: Added test cases without tabindex.
+
2019-08-21 Megan Gardner <megan_gard...@apple.com>
Do not adjust viewport if editing selection is already visible
Modified: trunk/LayoutTests/svg/custom/add-event-listener-shadow-tree-element.html (248982 => 248983)
--- trunk/LayoutTests/svg/custom/add-event-listener-shadow-tree-element.html 2019-08-22 00:24:54 UTC (rev 248982)
+++ trunk/LayoutTests/svg/custom/add-event-listener-shadow-tree-element.html 2019-08-22 00:34:48 UTC (rev 248983)
@@ -19,6 +19,7 @@
testRunner.dumpAsText();
testRunner.waitUntilDone();
}
+ use1.tabIndex = 0;
use1.setAttribute("onfocusin", "eventhandler()");
use1.focus();
}
Modified: trunk/LayoutTests/svg/custom/resources/focus-event-handling-keyboard.js (248982 => 248983)
--- trunk/LayoutTests/svg/custom/resources/focus-event-handling-keyboard.js 2019-08-22 00:24:54 UTC (rev 248982)
+++ trunk/LayoutTests/svg/custom/resources/focus-event-handling-keyboard.js 2019-08-22 00:34:48 UTC (rev 248983)
@@ -22,16 +22,22 @@
focusoutSeen = evt.target.getAttribute('id');
}
+rectElement.tabIndex = 0;
rectElement.setAttribute("onfocusin", "focusinHandler(evt)");
rectElement.setAttribute("onfocusout", "focusoutHandler(evt)");
+gElement.tabIndex = 0;
gElement.setAttribute("onfocusin", "focusinHandler(evt)");
gElement.setAttribute("onfocusout", "focusoutHandler(evt)");
+useElement.tabIndex = 0;
useElement.setAttribute("onfocusin", "focusinHandler(evt)");
useElement.setAttribute("onfocusout", "focusoutHandler(evt)");
+useElement2.tabIndex = 0;
useElement2.setAttribute("onfocusin", "focusinHandler(evt)");
useElement2.setAttribute("onfocusout", "focusoutHandler(evt)");
+switchElement.tabIndex = 0;
switchElement.setAttribute("onfocusin", "focusinHandler(evt)");
switchElement.setAttribute("onfocusout", "focusoutHandler(evt)");
+imgElement.tabIndex = 0;
imgElement.setAttribute("onfocusin", "focusinHandler(evt)");
imgElement.setAttribute("onfocusout", "focusoutHandler(evt)");
Modified: trunk/LayoutTests/svg/custom/resources/focus-event-handling.js (248982 => 248983)
--- trunk/LayoutTests/svg/custom/resources/focus-event-handling.js 2019-08-22 00:24:54 UTC (rev 248982)
+++ trunk/LayoutTests/svg/custom/resources/focus-event-handling.js 2019-08-22 00:34:48 UTC (rev 248983)
@@ -28,16 +28,22 @@
focusoutSeen = evt.target.getAttribute('id');
}
+rectElement.tabIndex = 0;
rectElement.setAttribute("onfocusin", "focusinHandler(evt)");
rectElement.setAttribute("onfocusout", "focusoutHandler(evt)");
+gElement.tabIndex = 0;
gElement.setAttribute("onfocusin", "focusinHandler(evt)");
gElement.setAttribute("onfocusout", "focusoutHandler(evt)");
+useElement.tabIndex = 0;
useElement.setAttribute("onfocusin", "focusinHandler(evt)");
useElement.setAttribute("onfocusout", "focusoutHandler(evt)");
+useElement2.tabIndex = 0;
useElement2.setAttribute("onfocusin", "focusinHandler(evt)");
useElement2.setAttribute("onfocusout", "focusoutHandler(evt)");
+switchElement.tabIndex = 0;
switchElement.setAttribute("onfocusin", "focusinHandler(evt)");
switchElement.setAttribute("onfocusout", "focusoutHandler(evt)");
+imgElement.tabIndex = 0;
imgElement.setAttribute("onfocusin", "focusinHandler(evt)");
imgElement.setAttribute("onfocusout", "focusoutHandler(evt)");
Modified: trunk/LayoutTests/svg/custom/tabindex-order-expected.txt (248982 => 248983)
--- trunk/LayoutTests/svg/custom/tabindex-order-expected.txt 2019-08-22 00:24:54 UTC (rev 248982)
+++ trunk/LayoutTests/svg/custom/tabindex-order-expected.txt 2019-08-22 00:34:48 UTC (rev 248983)
@@ -7,6 +7,7 @@
id: a tabindex: 1 [object SVGCircleElement] is focused.
id: b tabindex: 1 [object SVGGElement] is focused.
id: c tabindex: 1 [object SVGEllipseElement] is focused.
+id: symbol tabindex: 1 [object SVGSymbolElement] is focused.
id: d tabindex: 1 [object SVGPathElement] is focused.
id: e tabindex: 3 [object SVGAElement] is focused.
id: f tabindex: 4 [object SVGPolylineElement] is focused.
@@ -26,6 +27,7 @@
id: f tabindex: 4 [object SVGPolylineElement] is focused.
id: e tabindex: 3 [object SVGAElement] is focused.
id: d tabindex: 1 [object SVGPathElement] is focused.
+id: symbol tabindex: 1 [object SVGSymbolElement] is focused.
id: c tabindex: 1 [object SVGEllipseElement] is focused.
id: b tabindex: 1 [object SVGGElement] is focused.
id: a tabindex: 1 [object SVGCircleElement] is focused.
Modified: trunk/LayoutTests/svg/custom/tabindex-order.html (248982 => 248983)
--- trunk/LayoutTests/svg/custom/tabindex-order.html 2019-08-22 00:24:54 UTC (rev 248982)
+++ trunk/LayoutTests/svg/custom/tabindex-order.html 2019-08-22 00:34:48 UTC (rev 248983)
@@ -65,19 +65,29 @@
<p>To test, put focus in "a". Pressing Tab should focus "a" through "k" in order, and pressing Shift-Tab should reverse the order.</p>
<svg>
<rect class="tab" tabindex="6" id="g" width="1" height="1"/>
+ <rect class="tab" id="rect without tabindex is not focusable" width="1" height="1"/>
<circle class="tab" tabindex="1" id="a" r="1" cx="0" cy="0"/>
+ <circle class="tab" id="circle without tabindex is not focusable" r="1" cx="0" cy="0"/>
<rect class="tab" tabindex="-5" id="not in tab order (negative tabindex)" width="1" height="1"/>
<g class="tab" tabindex="1" id="b"/>
+ <g class="tab" id="g without tabindex is not focusable"/>
<svg class="tab" tabindex="0" id="i" width="1" height="1"/>
<text class="tab" tabindex="6" id="h" width="1" height="1"/>
+ <text class="tab" id="text without tabindex is not focusable" width="1" height="1"/>
<ellipse class="tab" tabindex="1" id="c" rx="1" ry="1" cx="0" cy="0"/>
- <symbol class="tab" tabindex="1" id="symbol is not focusable" width="1" height="1"/>
+ <ellipse class="tab" id="ellipse without tabindex is not focusable" rx="1" ry="1" cx="0" cy="0"/>
+ <symbol class="tab" tabindex="1" id="symbol" width="1" height="1"/>
+ <symbol class="tab" id="symbol without tabindex is not focusable" width="1" height="1"/>
<defs class="tab" tabindex="1" id="defs is not focusable"/>
<path class="tab" tabindex="1" id="d" d="M0,0"/>
+ <path class="tab" id="path without tabindex is not focusable" d="M0,0"/>
<line class="tab" tabindex="0" id="j" x1="1" x2="1" y1="0" y2="0"/>
+ <line class="tab" id="line without tabindex is not focusable" x1="1" x2="1" y1="0" y2="0"/>
<rect class="tab" tabindex="-1" id="not in tab order (negative tabindex)" width="1" height="1"/>
<polygon class="tab" tabindex="0" id="k" points="1,1 2,2"/>
+ <polygon class="tab" id="polygon without tabindex is not focusable" points="1,1 2,2"/>
<polyline class="tab" tabindex="4" id="f" points="1,1 2,2"/>
+ <polyline class="tab" id="polyline without tabindex is not focusable" points="1,1 2,2"/>
<a class="tab" tabindex="3" id="e"><rect width="1" height="1"/></a>
</svg>
Modified: trunk/Source/WebCore/ChangeLog (248982 => 248983)
--- trunk/Source/WebCore/ChangeLog 2019-08-22 00:24:54 UTC (rev 248982)
+++ trunk/Source/WebCore/ChangeLog 2019-08-22 00:34:48 UTC (rev 248983)
@@ -1,3 +1,24 @@
+2019-08-21 Ryosuke Niwa <rn...@webkit.org>
+
+ SVG element should become focusable when focus and key event listeners are added
+ https://bugs.webkit.org/show_bug.cgi?id=200997
+
+ Reviewed by Said Abou-Hallawa.
+
+ This patch removes the odd behavior WebKit (and Blink) browsers had to make SVG elements
+ with key or focus event listeners focusable. New behavior matches the behavior of Firefox
+ as well as the SVG 2.0 specification: https://www.w3.org/TR/SVG2/interact.html#Focus
+
+ Test: svg/custom/tabindex-order.html
+
+ * svg/SVGAElement.cpp:
+ (WebCore::SVGAElement::supportsFocus const):
+ * svg/SVGElement.cpp:
+ (WebCore::SVGElement::hasFocusEventListeners const): Deleted.
+ (WebCore::SVGElement::isMouseFocusable const): Deleted.
+ * svg/SVGElement.h:
+ * svg/SVGGraphicsElement.h:
+
2019-08-21 Jer Noble <jer.no...@apple.com>
Adopt AVSystemController_ActiveAudioRouteDidChangeNotification
Modified: trunk/Source/WebCore/svg/SVGAElement.cpp (248982 => 248983)
--- trunk/Source/WebCore/svg/SVGAElement.cpp 2019-08-22 00:24:54 UTC (rev 248982)
+++ trunk/Source/WebCore/svg/SVGAElement.cpp 2019-08-22 00:34:48 UTC (rev 248983)
@@ -161,7 +161,7 @@
if (hasEditableStyle())
return SVGGraphicsElement::supportsFocus();
// If not a link we should still be able to focus the element if it has a tabIndex.
- return isLink() || Element::supportsFocus();
+ return isLink() || SVGGraphicsElement::supportsFocus();
}
bool SVGAElement::isURLAttribute(const Attribute& attribute) const
Modified: trunk/Source/WebCore/svg/SVGElement.cpp (248982 => 248983)
--- trunk/Source/WebCore/svg/SVGElement.cpp 2019-08-22 00:24:54 UTC (rev 248982)
+++ trunk/Source/WebCore/svg/SVGElement.cpp 2019-08-22 00:34:48 UTC (rev 248983)
@@ -983,26 +983,6 @@
}
}
-bool SVGElement::hasFocusEventListeners() const
-{
- Element* eventTarget = const_cast<SVGElement*>(this);
- return eventTarget->hasEventListeners(eventNames().focusinEvent)
- || eventTarget->hasEventListeners(eventNames().focusoutEvent)
- || eventTarget->hasEventListeners(eventNames().focusEvent)
- || eventTarget->hasEventListeners(eventNames().blurEvent);
-}
-
-bool SVGElement::isMouseFocusable() const
-{
- if (!isFocusable())
- return false;
- Element* eventTarget = const_cast<SVGElement*>(this);
- return hasFocusEventListeners()
- || eventTarget->hasEventListeners(eventNames().keydownEvent)
- || eventTarget->hasEventListeners(eventNames().keyupEvent)
- || eventTarget->hasEventListeners(eventNames().keypressEvent);
-}
-
void SVGElement::accessKeyAction(bool sendMouseEvents)
{
dispatchSimulatedClick(0, sendMouseEvents ? SendMouseUpDownEvents : SendNoEvents);
Modified: trunk/Source/WebCore/svg/SVGElement.h (248982 => 248983)
--- trunk/Source/WebCore/svg/SVGElement.h 2019-08-22 00:24:54 UTC (rev 248982)
+++ trunk/Source/WebCore/svg/SVGElement.h 2019-08-22 00:34:48 UTC (rev 248983)
@@ -116,7 +116,6 @@
bool addEventListener(const AtomString& eventType, Ref<EventListener>&&, const AddEventListenerOptions&) override;
bool removeEventListener(const AtomString& eventType, EventListener&, const ListenerOptions&) override;
- bool hasFocusEventListeners() const;
bool hasTagName(const SVGQualifiedName& name) const { return hasLocalName(name.localName()); }
@@ -153,9 +152,6 @@
SVGElement(const QualifiedName&, Document&);
virtual ~SVGElement();
- bool isMouseFocusable() const override;
- bool supportsFocus() const override { return false; }
-
bool rendererIsNeeded(const RenderStyle&) override;
void parseAttribute(const QualifiedName&, const AtomString&) override;
Modified: trunk/Source/WebCore/svg/SVGGraphicsElement.h (248982 => 248983)
--- trunk/Source/WebCore/svg/SVGGraphicsElement.h 2019-08-22 00:24:54 UTC (rev 248982)
+++ trunk/Source/WebCore/svg/SVGGraphicsElement.h 2019-08-22 00:34:48 UTC (rev 248983)
@@ -70,8 +70,6 @@
protected:
SVGGraphicsElement(const QualifiedName&, Document&);
- bool supportsFocus() const override { return Element::supportsFocus() || hasFocusEventListeners(); }
-
void parseAttribute(const QualifiedName&, const AtomString&) override;
void svgAttributeChanged(const QualifiedName&) override;
