<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[198941] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/198941">198941</a></dd>
<dt>Author</dt> <dd>n_wang@apple.com</dd>
<dt>Date</dt> <dd>2016-03-31 22:34:46 -0700 (Thu, 31 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: AX hit-testing does not work on WebKit video playback buttons
https://bugs.webkit.org/show_bug.cgi?id=156084
Reviewed by Darin Adler.
Source/WebCore:
Use the element at point instead of the shadow host for hit testing on video tags.
Test: accessibility/mac/video-tag-hit-test.html
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::elementAccessibilityHitTest):
(WebCore::shouldUseShadowHostForHitTesting):
(WebCore::AccessibilityRenderObject::accessibilityHitTest):
LayoutTests:
* accessibility/mac/video-tag-hit-test-expected.txt: Added.
* accessibility/mac/video-tag-hit-test.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk1TestExpectations">trunk/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilitymacvideotaghittestexpectedtxt">trunk/LayoutTests/accessibility/mac/video-tag-hit-test-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitymacvideotaghittesthtml">trunk/LayoutTests/accessibility/mac/video-tag-hit-test.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198940 => 198941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-01 04:54:02 UTC (rev 198940)
+++ trunk/LayoutTests/ChangeLog 2016-04-01 05:34:46 UTC (rev 198941)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-03-31 Nan Wang <n_wang@apple.com>
+
+ AX: AX hit-testing does not work on WebKit video playback buttons
+ https://bugs.webkit.org/show_bug.cgi?id=156084
+
+ Reviewed by Darin Adler.
+
+ * accessibility/mac/video-tag-hit-test-expected.txt: Added.
+ * accessibility/mac/video-tag-hit-test.html: Added.
+
</ins><span class="cx"> 2016-03-31 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r197724): <object>/<embed> with no URL does not match source *
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacvideotaghittestexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/mac/video-tag-hit-test-expected.txt (0 => 198941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/video-tag-hit-test-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/mac/video-tag-hit-test-expected.txt 2016-04-01 05:34:46 UTC (rev 198941)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+
+This tests that hit testing works on video tag.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS element.role is 'AXRole: AXButton'
+PASS element.description is 'AXDescription: Play'
+PASS element.parentElement().role is 'AXRole: AXToolbar'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacvideotaghittesthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/mac/video-tag-hit-test.html (0 => 198941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/video-tag-hit-test.html (rev 0)
+++ trunk/LayoutTests/accessibility/mac/video-tag-hit-test.html 2016-04-01 05:34:46 UTC (rev 198941)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<style>
+div.absolute {
+ position: absolute;
+ top: 0px;
+ left: 0px;
+ width: 400px;
+ height: 200px;
+ border: 1px solid #73AD21;
+}
+</style>
+</head>
+<body id="body">
+
+<div class="absolute" id="container" tabindex=0 id="region" title="region">
+<video id="video" width="400" height="200" controls>
+ <source src="" type="video/mp4">
+ Test Video.
+</video>
+</div>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that hit testing works on video tag.");
+
+ if (window.accessibilityController) {
+
+ var element = accessibilityController.elementAtPoint(10, 185);
+ shouldBe("element.role", "'AXRole: AXButton'");
+ shouldBe("element.description", "'AXDescription: Play'");
+ shouldBe("element.parentElement().role", "'AXRole: AXToolbar'");
+ }
+
+</script>
+
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (198940 => 198941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2016-04-01 04:54:02 UTC (rev 198940)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2016-04-01 05:34:46 UTC (rev 198941)
</span><span class="lines">@@ -198,3 +198,6 @@
</span><span class="cx">
</span><span class="cx"> # This test checks ScrollAnimator events only for main frame scrollbars that use native widgets in WK1.
</span><span class="cx"> fast/scrolling/scroll-animator-overlay-scrollbars-hovered.html [ Skip ]
</span><ins>+
+# This hit-test test doesn't work on DRT
+webkit.org/b/156084 accessibility/mac/video-tag-hit-test.html [ Skip ]
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198940 => 198941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-01 04:54:02 UTC (rev 198940)
+++ trunk/Source/WebCore/ChangeLog 2016-04-01 05:34:46 UTC (rev 198941)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-03-31 Nan Wang <n_wang@apple.com>
+
+ AX: AX hit-testing does not work on WebKit video playback buttons
+ https://bugs.webkit.org/show_bug.cgi?id=156084
+
+ Reviewed by Darin Adler.
+
+ Use the element at point instead of the shadow host for hit testing on video tags.
+
+ Test: accessibility/mac/video-tag-hit-test.html
+
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::elementAccessibilityHitTest):
+ (WebCore::shouldUseShadowHostForHitTesting):
+ (WebCore::AccessibilityRenderObject::accessibilityHitTest):
+
</ins><span class="cx"> 2016-03-31 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Page overlay tests sometimes crash under MockPageOverlayClient::uninstallAllOverlays()
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (198940 => 198941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2016-04-01 04:54:02 UTC (rev 198940)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2016-04-01 05:34:46 UTC (rev 198941)
</span><span class="lines">@@ -2249,6 +2249,12 @@
</span><span class="cx"> return AccessibilityObject::elementAccessibilityHitTest(point);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool shouldUseShadowHostForHitTesting(Node* shadowHost)
+{
+ // We need to allow automation of mouse events on video tags.
+ return shadowHost && !shadowHost->hasTagName(videoTag);
+}
+
</ins><span class="cx"> AccessibilityObject* AccessibilityRenderObject::accessibilityHitTest(const IntPoint& point) const
</span><span class="cx"> {
</span><span class="cx"> if (!m_renderer || !m_renderer->hasLayer())
</span><span class="lines">@@ -2261,9 +2267,12 @@
</span><span class="cx"> HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::AccessibilityHitTest);
</span><span class="cx"> HitTestResult hitTestResult = HitTestResult(point);
</span><span class="cx"> layer->hitTest(request, hitTestResult);
</span><del>- if (!hitTestResult.innerNode())
</del><ins>+ Node* node = hitTestResult.innerNode();
+ if (!node)
</ins><span class="cx"> return nullptr;
</span><del>- Node* node = hitTestResult.innerNode()->deprecatedShadowAncestorNode();
</del><ins>+ Node* shadowAncestorNode = node->shadowHost();
+ if (shouldUseShadowHostForHitTesting(shadowAncestorNode))
+ node = shadowAncestorNode;
</ins><span class="cx"> ASSERT(node);
</span><span class="cx">
</span><span class="cx"> if (is<HTMLAreaElement>(*node))
</span></span></pre>
</div>
</div>
</body>
</html>