<!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>[173699] branches/safari-600.1-branch/Source/WebCore</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/173699">173699</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-09-17 13:39:56 -0700 (Wed, 17 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/173631">r173631</a>. rdar://problem/18187713</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreModulesmediacontrolsmediaControlsApplecss">branches/safari-600.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreModulesmediacontrolsmediaControlsApplejs">branches/safari-600.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
<li><a href="#branchessafari6001branchSourceWebCorepageDragControllercpp">branches/safari-600.1-branch/Source/WebCore/page/DragController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (173698 => 173699)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-09-17 20:03:14 UTC (rev 173698)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-09-17 20:39:56 UTC (rev 173699)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2014-09-17 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r173631. rdar://problem/18187713
+
+ 2014-09-15 Jer Noble <jer.noble@apple.com>
+
+ Videos with controls enabled never receive 'dragstart' events.
+ https://bugs.webkit.org/show_bug.cgi?id=136837
+
+ Reviewed by Simon Fraser.
+
+ When initiating a drag, the DragController checks whether the hit-tested element at a
+ drag location is a child of the drag source, and bails if early if that is not the case.
+ For a <video> element with controls, the hit-tested element is an element within the
+ <video> element's Shadow DOM. Because the DragController uses a method which does not
+ take Shadow DOM into account when determining a child-parent relationship, this test fails
+ and all drag operations fail as well.
+
+ For <video> elements only, when testing whether the drag source is an ancestor of the
+ hit-tested element, use containsIncludingShadowDOM() instead of contains(). To ensure that
+ the controls are still usable when a drag listener is active on a <video> element, mark
+ the controls as a draggable element, but simply call preventDefault() in the controls'
+ 'dragstart' handler, ensuring the timeline and volume controls are themselves still draggable.
+
+ * Modules/mediacontrols/mediaControlsApple.css:
+ (audio::-webkit-media-controls-panel):
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.createControls):
+ (Controller.prototype.handlePanelDragStart):
+ * page/DragController.cpp:
+ (WebCore::DragController::startDrag):
+
</ins><span class="cx"> 2014-09-16 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] MediaPlayerPrivateAVFoundationObjC::paintWithVideoOutput doesn't work with rotated movies
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreModulesmediacontrolsmediaControlsApplecss"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css (173698 => 173699)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2014-09-17 20:03:14 UTC (rev 173698)
+++ branches/safari-600.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2014-09-17 20:39:56 UTC (rev 173699)
</span><span class="lines">@@ -80,6 +80,7 @@
</span><span class="cx"> height: 25px;
</span><span class="cx"> line-height: 25px;
</span><span class="cx"> -webkit-user-select: none;
</span><ins>+ -webkit-user-drag: element;
</ins><span class="cx"> background-color: transparent;
</span><span class="cx"> background-image: -webkit-linear-gradient(top,
</span><span class="cx"> rgba(0, 0, 0, .92) 0,
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (173698 => 173699)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-09-17 20:03:14 UTC (rev 173698)
+++ branches/safari-600.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-09-17 20:39:56 UTC (rev 173699)
</span><span class="lines">@@ -296,6 +296,7 @@
</span><span class="cx"> this.listenFor(panel, 'transitionend', this.handlePanelTransitionEnd);
</span><span class="cx"> this.listenFor(panel, 'click', this.handlePanelClick);
</span><span class="cx"> this.listenFor(panel, 'dblclick', this.handlePanelClick);
</span><ins>+ this.listenFor(panel, 'dragstart', this.handlePanelDragStart);
</ins><span class="cx">
</span><span class="cx"> var rewindButton = this.controls.rewindButton = document.createElement('button');
</span><span class="cx"> rewindButton.setAttribute('pseudo', '-webkit-media-controls-rewind-button');
</span><span class="lines">@@ -697,6 +698,12 @@
</span><span class="cx"> event.preventDefault();
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ handlePanelDragStart: function(event)
+ {
+ // Prevent drags in the panel from triggering a drag event on the <video> element.
+ event.preventDefault();
+ },
+
</ins><span class="cx"> handleRewindButtonClicked: function(event)
</span><span class="cx"> {
</span><span class="cx"> var newTime = Math.max(
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCorepageDragControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/page/DragController.cpp (173698 => 173699)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/page/DragController.cpp 2014-09-17 20:03:14 UTC (rev 173698)
+++ branches/safari-600.1-branch/Source/WebCore/page/DragController.cpp 2014-09-17 20:39:56 UTC (rev 173699)
</span><span class="lines">@@ -721,7 +721,16 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> HitTestResult hitTestResult = src.eventHandler().hitTestResultAtPoint(dragOrigin, HitTestRequest::ReadOnly | HitTestRequest::Active);
</span><del>- if (!state.source->contains(hitTestResult.innerNode()))
</del><ins>+
+ // FIXME(136836): Investigate whether all elements should use the containsIncludingShadowDOM() path here.
+ bool includeShadowDOM = state.source->isMediaElement();
+ bool sourceContainsHitNode;
+ if (includeShadowDOM)
+ sourceContainsHitNode = state.source->contains(hitTestResult.innerNode());
+ else
+ sourceContainsHitNode = state.source->containsIncludingShadowDOM(hitTestResult.innerNode());
+
+ if (!sourceContainsHitNode)
</ins><span class="cx"> // The original node being dragged isn't under the drag origin anymore... maybe it was
</span><span class="cx"> // hidden or moved out from under the cursor. Regardless, we don't want to start a drag on
</span><span class="cx"> // something that's not actually under the drag origin.
</span></span></pre>
</div>
</div>
</body>
</html>