<!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>[166277] 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/166277">166277</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-25 19:30:27 -0700 (Tue, 25 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>When the mouse is upped after dragged out of shadowDOM, it should lose :active.
https://bugs.webkit.org/show_bug.cgi?id=130660
Patch by Sanghyup Lee <sh53.lee@samsung.com> on 2014-03-25
Reviewed by Darin Adler.
Source/WebCore:
This caused a regression after <a href="http://trac.webkit.org/projects/webkit/changeset/165037">r165037</a>.
When we have to clear :active style of shadow DOM, we should clear host's style.
This patch replaces parentElement() by parentOrShadowHostElement().
* dom/Document.cpp:
(WebCore::Document::updateHoverActiveState):
LayoutTests:
* fast/css/hover-active-drag-expected.txt: Added a test for textarea.
* fast/css/hover-active-drag.html: Updated.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcsshoveractivedragexpectedtxt">trunk/LayoutTests/fast/css/hover-active-drag-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcsshoveractivedraghtml">trunk/LayoutTests/fast/css/hover-active-drag.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (166276 => 166277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-26 02:14:40 UTC (rev 166276)
+++ trunk/LayoutTests/ChangeLog 2014-03-26 02:30:27 UTC (rev 166277)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-03-25 Sanghyup Lee <sh53.lee@samsung.com>
+
+ When the mouse is upped after dragged out of shadowDOM, it should lose :active.
+ https://bugs.webkit.org/show_bug.cgi?id=130660
+
+ Reviewed by Darin Adler.
+
+ * fast/css/hover-active-drag-expected.txt: Added a test for textarea.
+ * fast/css/hover-active-drag.html: Updated.
+
</ins><span class="cx"> 2014-03-25 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Repatch should plant calls to getters directly rather than through a C helper
</span></span></pre></div>
<a id="trunkLayoutTestsfastcsshoveractivedragexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/hover-active-drag-expected.txt (166276 => 166277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/hover-active-drag-expected.txt 2014-03-26 02:14:40 UTC (rev 166276)
+++ trunk/LayoutTests/fast/css/hover-active-drag-expected.txt 2014-03-26 02:30:27 UTC (rev 166277)
</span><span class="lines">@@ -1,3 +1,4 @@
</span><ins>+
</ins><span class="cx"> Dragging out of an element should cause it to lose :hover
</span><span class="cx">
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="lines">@@ -12,6 +13,10 @@
</span><span class="cx"> PASS background is "rgb(0, 0, 0)"
</span><span class="cx"> PASS background is "rgb(0, 0, 0)"
</span><span class="cx"> PASS background is "rgb(0, 0, 0)"
</span><ins>+PASS background is "rgb(255, 0, 0)"
+PASS background is "rgb(255, 255, 0)"
+PASS background is "rgb(0, 255, 0)"
+PASS background is "rgb(0, 0, 0)"
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcsshoveractivedraghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/hover-active-drag.html (166276 => 166277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/hover-active-drag.html 2014-03-26 02:14:40 UTC (rev 166276)
+++ trunk/LayoutTests/fast/css/hover-active-drag.html 2014-03-26 02:30:27 UTC (rev 166277)
</span><span class="lines">@@ -1,10 +1,10 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <style>
</span><del>- div { background: rgb(0, 0, 0); }
- div:hover { background: rgb(255, 0, 0); }
- div:hover:active { background: rgb(255, 255, 0); }
- div:active { background: rgb(0, 255, 0); }
- div {
</del><ins>+ div, textarea { background: rgb(0, 0, 0); }
+ div:hover, textarea:hover { background: rgb(255, 0, 0); }
+ div:hover:active, textarea:hover:active { background: rgb(255, 255, 0); }
+ div:active, textarea:active { background: rgb(0, 255, 0); }
+ div, textarea {
</ins><span class="cx"> width: 100px;
</span><span class="cx"> height: 100px;
</span><span class="cx"> border: 2px solid rgb(0, 0, 255);
</span><span class="lines">@@ -14,6 +14,7 @@
</span><span class="cx"> <body>
</span><span class="cx"> <div id="box"></div>
</span><span class="cx"> <div id="box2"></div>
</span><ins>+ <textarea id="textarea"></textarea>
</ins><span class="cx"> <pre id="description"></div>
</span><span class="cx"> <pre id="console"></pre>
</span><span class="cx"> </body>
</span><span class="lines">@@ -59,5 +60,18 @@
</span><span class="cx"> eventSender.mouseUp()
</span><span class="cx"> shouldHaveBackground(box, 'rgb(0, 0, 0)')
</span><span class="cx"> shouldHaveBackground(box2, 'rgb(0, 0, 0)')
</span><ins>+
+ // Move into the textarea.
+ eventSender.mouseMoveTo(50, 250)
+ shouldHaveBackground(textarea, 'rgb(255, 0, 0)')
+
+ eventSender.mouseDown()
+ shouldHaveBackground(textarea, 'rgb(255, 255, 0)')
+
+ eventSender.mouseMoveTo(400, 250)
+ shouldHaveBackground(textarea, 'rgb(0, 255, 0)')
+
+ eventSender.mouseUp()
+ shouldHaveBackground(textarea, 'rgb(0, 0, 0)')
</ins><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166276 => 166277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-26 02:14:40 UTC (rev 166276)
+++ trunk/Source/WebCore/ChangeLog 2014-03-26 02:30:27 UTC (rev 166277)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-03-25 Sanghyup Lee <sh53.lee@samsung.com>
+
+ When the mouse is upped after dragged out of shadowDOM, it should lose :active.
+ https://bugs.webkit.org/show_bug.cgi?id=130660
+
+ Reviewed by Darin Adler.
+
+ This caused a regression after r165037.
+ When we have to clear :active style of shadow DOM, we should clear host's style.
+ This patch replaces parentElement() by parentOrShadowHostElement().
+
+ * dom/Document.cpp:
+ (WebCore::Document::updateHoverActiveState):
+
</ins><span class="cx"> 2014-03-25 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Always retry a failed MediaDocument as a PluginDocument
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (166276 => 166277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-03-26 02:14:40 UTC (rev 166276)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-03-26 02:30:27 UTC (rev 166277)
</span><span class="lines">@@ -5841,7 +5841,7 @@
</span><span class="cx"> Element* oldActiveElement = m_activeElement.get();
</span><span class="cx"> if (oldActiveElement && !request.active()) {
</span><span class="cx"> // We are clearing the :active chain because the mouse has been released.
</span><del>- for (Element* curr = oldActiveElement; curr; curr = curr->parentElement()) {
</del><ins>+ for (Element* curr = oldActiveElement; curr; curr = curr->parentOrShadowHostElement()) {
</ins><span class="cx"> curr->setActive(false);
</span><span class="cx"> m_userActionElements.setInActiveChain(curr, false);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>