<!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>[169024] 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/169024">169024</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-18 16:25:17 -0700 (Sun, 18 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Input ::selection pseudo class does not work leading to hidden selection
https://bugs.webkit.org/show_bug.cgi?id=38943
Source/WebCore:
Patch by Svetlana Redchenko <redchenko@yandex-team.ru> on 2014-05-18
Reviewed by Darin Adler.
Test: fast/selectors/input-with-selection-pseudo-element.html
When text is selected inside input element, it should change the
color and background color according to the ::selection pseudo element.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::selectionBackgroundColor):
(WebCore::RenderObject::selectionColor):
(WebCore::RenderObject::selectionPseudoStyle):
* rendering/RenderObject.h:
LayoutTests:
Patch by Svetlana Redchenko <redchenko@yandex-team.ru> on 2014-05-18
Reviewed by Darin Adler.
* fast/selectors/input-with-selection-pseudo-element-expected.html: Added.
* fast/selectors/input-with-selection-pseudo-element.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjecth">trunk/Source/WebCore/rendering/RenderObject.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastselectorsinputwithselectionpseudoelementexpectedhtml">trunk/LayoutTests/fast/selectors/input-with-selection-pseudo-element-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastselectorsinputwithselectionpseudoelementhtml">trunk/LayoutTests/fast/selectors/input-with-selection-pseudo-element.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (169023 => 169024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-18 23:12:37 UTC (rev 169023)
+++ trunk/LayoutTests/ChangeLog 2014-05-18 23:25:17 UTC (rev 169024)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-05-18 Svetlana Redchenko <redchenko@yandex-team.ru>
+
+ Input ::selection pseudo class does not work leading to hidden selection
+ https://bugs.webkit.org/show_bug.cgi?id=38943
+
+ Reviewed by Darin Adler.
+
+ * fast/selectors/input-with-selection-pseudo-element-expected.html: Added.
+ * fast/selectors/input-with-selection-pseudo-element.html: Added.
+
</ins><span class="cx"> 2014-05-18 Maciej Stachowiak <mjs@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r156546): Default media controls are laid out incorrectly when media element is styled with direction:rtl
</span></span></pre></div>
<a id="trunkLayoutTestsfastselectorsinputwithselectionpseudoelementexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/selectors/input-with-selection-pseudo-element-expected.html (0 => 169024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/selectors/input-with-selection-pseudo-element-expected.html (rev 0)
+++ trunk/LayoutTests/fast/selectors/input-with-selection-pseudo-element-expected.html 2014-05-18 23:25:17 UTC (rev 169024)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+<!DOCTYPE html>
+<div style="border:5px solid; width:100px; font-size:16px; font-family:sans-serif;">
+ <span style="background-color:rgba(63, 128, 33, 0.95); color:yellow;">Hello</span>
+</div>
+<br>Fix for ::selection pseudo element to work on input elements.
+<br>The above selected text in the input box should have green background and yellow color.
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfastselectorsinputwithselectionpseudoelementhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/selectors/input-with-selection-pseudo-element.html (0 => 169024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/selectors/input-with-selection-pseudo-element.html (rev 0)
+++ trunk/LayoutTests/fast/selectors/input-with-selection-pseudo-element.html 2014-05-18 23:25:17 UTC (rev 169024)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ ::selection { background-color: rgba(63, 128, 33, 0.95); color: yellow; }
+</style>
+<input id="inputText" type="text" value="Hello" style="border:5px solid; width:100px; font-size:16px; font-family:sans-serif; padding:0; margin:0; outline:none;"><br>
+<br>Fix for ::selection pseudo element to work on input elements.
+<br>The above selected text in the input box should have green background and yellow color.
+<script>
+ document.getElementById('inputText').select();
+</script>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169023 => 169024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-18 23:12:37 UTC (rev 169023)
+++ trunk/Source/WebCore/ChangeLog 2014-05-18 23:25:17 UTC (rev 169024)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-05-18 Svetlana Redchenko <redchenko@yandex-team.ru>
+
+ Input ::selection pseudo class does not work leading to hidden selection
+ https://bugs.webkit.org/show_bug.cgi?id=38943
+
+ Reviewed by Darin Adler.
+
+ Test: fast/selectors/input-with-selection-pseudo-element.html
+
+ When text is selected inside input element, it should change the
+ color and background color according to the ::selection pseudo element.
+
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::selectionBackgroundColor):
+ (WebCore::RenderObject::selectionColor):
+ (WebCore::RenderObject::selectionPseudoStyle):
+ * rendering/RenderObject.h:
+
</ins><span class="cx"> 2014-05-18 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> [WebKit2] Implement ScriptMessageHandlers
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (169023 => 169024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2014-05-18 23:12:37 UTC (rev 169023)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2014-05-18 23:25:17 UTC (rev 169024)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> #include "RenderView.h"
</span><span class="cx"> #include "SVGRenderSupport.h"
</span><span class="cx"> #include "Settings.h"
</span><ins>+#include "ShadowRoot.h"
</ins><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include "TransformState.h"
</span><span class="cx"> #include "htmlediting.h"
</span><span class="lines">@@ -1499,7 +1500,7 @@
</span><span class="cx"> if (frame().selection().shouldShowBlockCursor() && frame().selection().isCaret())
</span><span class="cx"> color = style().visitedDependentColor(CSSPropertyColor).blendWithWhite();
</span><span class="cx"> else {
</span><del>- RefPtr<RenderStyle> pseudoStyle = getUncachedPseudoStyle(PseudoStyleRequest(SELECTION));
</del><ins>+ RefPtr<RenderStyle> pseudoStyle = selectionPseudoStyle();
</ins><span class="cx"> if (pseudoStyle && pseudoStyle->visitedDependentColor(CSSPropertyBackgroundColor).isValid())
</span><span class="cx"> color = pseudoStyle->visitedDependentColor(CSSPropertyBackgroundColor).blendWithWhite();
</span><span class="cx"> else
</span><span class="lines">@@ -1519,7 +1520,7 @@
</span><span class="cx"> || (view().frameView().paintBehavior() & PaintBehaviorSelectionOnly))
</span><span class="cx"> return color;
</span><span class="cx">
</span><del>- if (RefPtr<RenderStyle> pseudoStyle = getUncachedPseudoStyle(PseudoStyleRequest(SELECTION))) {
</del><ins>+ if (RefPtr<RenderStyle> pseudoStyle = selectionPseudoStyle()) {
</ins><span class="cx"> color = pseudoStyle->visitedDependentColor(colorProperty);
</span><span class="cx"> if (!color.isValid())
</span><span class="cx"> color = pseudoStyle->visitedDependentColor(CSSPropertyColor);
</span><span class="lines">@@ -1529,6 +1530,21 @@
</span><span class="cx"> return color;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+PassRefPtr<RenderStyle> RenderObject::selectionPseudoStyle() const
+{
+ if (isAnonymous())
+ return nullptr;
+
+ if (ShadowRoot* root = m_node.containingShadowRoot()) {
+ if (root->type() == ShadowRoot::UserAgentShadowRoot) {
+ if (Element* shadowHost = m_node.shadowHost())
+ return shadowHost->renderer()->getUncachedPseudoStyle(PseudoStyleRequest(SELECTION));
+ }
+ }
+
+ return getUncachedPseudoStyle(PseudoStyleRequest(SELECTION));
+}
+
</ins><span class="cx"> Color RenderObject::selectionForegroundColor() const
</span><span class="cx"> {
</span><span class="cx"> return selectionColor(CSSPropertyWebkitTextFillColor);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (169023 => 169024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h 2014-05-18 23:12:37 UTC (rev 169023)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2014-05-18 23:25:17 UTC (rev 169024)
</span><span class="lines">@@ -897,6 +897,7 @@
</span><span class="cx"> void removeFromRenderFlowThreadRecursive(RenderFlowThread*);
</span><span class="cx">
</span><span class="cx"> Color selectionColor(int colorProperty) const;
</span><ins>+ PassRefPtr<RenderStyle> selectionPseudoStyle() const;
</ins><span class="cx">
</span><span class="cx"> Node* generatingPseudoHostElement() const;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>