<!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>[202066] 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/202066">202066</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-06-14 15:09:33 -0700 (Tue, 14 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add the unprefixed version of the pseudo element ::placeholder
https://bugs.webkit.org/show_bug.cgi?id=158653
Patch by Benjamin Poulain <bpoulain@apple.com> on 2016-06-14
Reviewed by Dean Jackson.
Source/WebCore:
Test: fast/forms/placeholder-pseudo-element-with-webkit-prefix.html
The pseudo element ::-webkit-input-placeholder is stupidly popular
which forces other engines to support this exact name.
The pseudo-element spec provides a new standard name we can adopt
to drop the prefix: https://drafts.csswg.org/css-pseudo-4/#placeholder-pseudo
This patch does just that, make ::placeholder the standard name to select
the placeholder element in the shadow dom of input elements.
Unlike pseudo classes, we did not have any support for prefixes and aliasing.
I want to keep the absurdly efficient matching we currently use for styling
because style updates are more common than stylesheet updates.
With that constraint in mind, the value of CSSSelector has to be the unprefixed
version for both forms of input.
This leaves us with the problem of displaying the CSSSelector for CSSOM.
To differentiate the legacy form from the standard form, I added
a new type of PseudoElement: PseudoElementWebKitCustomLegacyPrefixed.
When parsing, PseudoElementWebKitCustomLegacyPrefixed let us replace
the original value "-webkit-input-placeholder" by the standard value.
When creating the selectorText for CSSOM, PseudoElementWebKitCustomLegacyPrefixed
let us replace the standard for by the legacy form.
* css/CSSParserValues.cpp:
(WebCore::CSSParserSelector::parsePseudoElementSelector):
* css/CSSSelector.cpp:
(WebCore::CSSSelector::pseudoId):
(WebCore::CSSSelector::selectorText):
* css/CSSSelector.h:
(WebCore::CSSSelector::isCustomPseudoElement):
(WebCore::CSSSelector::isWebKitCustomPseudoElement):
* css/SelectorChecker.cpp:
(WebCore::SelectorChecker::matchRecursively):
* css/SelectorPseudoElementTypeMap.in:
* css/html.css:
(::placeholder):
(input::placeholder, isindex::placeholder):
(textarea::placeholder):
(::-webkit-input-placeholder): Deleted.
(input::-webkit-input-placeholder, isindex::-webkit-input-placeholder): Deleted.
(textarea::-webkit-input-placeholder): Deleted.
* features.json:
* html/shadow/TextControlInnerElements.cpp:
(WebCore::TextControlPlaceholderElement::TextControlPlaceholderElement):
Source/WebInspectorUI:
* UserInterface/Views/FilterBar.css:
(.filter-bar > input[type="search"]::placeholder):
(.filter-bar > input[type="search"]::-webkit-input-placeholder): Deleted.
* UserInterface/Views/FindBanner.css:
(.find-banner.console-find-banner > input[type="search"]::placeholder):
(.find-banner.console-find-banner > input[type="search"]::-webkit-input-placeholder): Deleted.
* UserInterface/Views/GoToLineDialog.css:
(.go-to-line-dialog > div > input::placeholder):
(.go-to-line-dialog > div > input::-webkit-input-placeholder): Deleted.
* UserInterface/Views/OpenResourceDialog.css:
(.open-resource-dialog > .field > input::placeholder):
(.open-resource-dialog > .field > input::-webkit-input-placeholder): Deleted.
* UserInterface/Views/SearchBar.css:
(.search-bar > input[type="search"]::placeholder):
(.search-bar > input[type="search"]::-webkit-input-placeholder): Deleted.
* UserInterface/Views/VisualStyleCommaSeparatedKeywordEditor.css:
LayoutTests:
* fast/css/css-selector-text-expected.txt:
* fast/css/css-selector-text.html:
* fast/css/css-set-selector-text-expected.txt:
* fast/css/css-set-selector-text.html:
This covers CSSOM for the prefixed version.
* fast/forms/placeholder-pseudo-element-with-webkit-prefix-expected.html: Added.
* fast/forms/placeholder-pseudo-element-with-webkit-prefix.html: Added.
This verifies both version of the pseudo elements are equivalent.
* fast/css/pseudo-cache-stale-expected.html:
* fast/css/pseudo-cache-stale.html:
* fast/forms/input-placeholder-paint-order-2-expected.html:
* fast/forms/input-placeholder-paint-order-2.html:
* fast/forms/input-placeholder-paint-order.html:
* fast/forms/input-placeholder-text-indent.html:
* fast/forms/input-user-modify.html:
* fast/forms/isindex-placeholder.html:
* fast/forms/placeholder-position.html:
* fast/forms/placeholder-pseudo-style.html:
* fast/forms/textarea-placeholder-pseudo-style.html:
* fast/forms/textarea/textarea-placeholder-paint-order-2-expected.html:
* fast/forms/textarea/textarea-placeholder-paint-order-2.html:
* fast/forms/textarea/textarea-placeholder-paint-order.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcsscssselectortextexpectedtxt">trunk/LayoutTests/fast/css/css-selector-text-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcsscssselectortexthtml">trunk/LayoutTests/fast/css/css-selector-text.html</a></li>
<li><a href="#trunkLayoutTestsfastcsscsssetselectortextexpectedtxt">trunk/LayoutTests/fast/css/css-set-selector-text-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcsscsssetselectortexthtml">trunk/LayoutTests/fast/css/css-set-selector-text.html</a></li>
<li><a href="#trunkLayoutTestsfastcsspseudocachestaleexpectedhtml">trunk/LayoutTests/fast/css/pseudo-cache-stale-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcsspseudocachestalehtml">trunk/LayoutTests/fast/css/pseudo-cache-stale.html</a></li>
<li><a href="#trunkLayoutTestsfastformsinputplaceholderpaintorder2expectedhtml">trunk/LayoutTests/fast/forms/input-placeholder-paint-order-2-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastformsinputplaceholderpaintorder2html">trunk/LayoutTests/fast/forms/input-placeholder-paint-order-2.html</a></li>
<li><a href="#trunkLayoutTestsfastformsinputplaceholderpaintorderhtml">trunk/LayoutTests/fast/forms/input-placeholder-paint-order.html</a></li>
<li><a href="#trunkLayoutTestsfastformsinputplaceholdertextindenthtml">trunk/LayoutTests/fast/forms/input-placeholder-text-indent.html</a></li>
<li><a href="#trunkLayoutTestsfastformsinputusermodifyhtml">trunk/LayoutTests/fast/forms/input-user-modify.html</a></li>
<li><a href="#trunkLayoutTestsfastformsisindexplaceholderhtml">trunk/LayoutTests/fast/forms/isindex-placeholder.html</a></li>
<li><a href="#trunkLayoutTestsfastformsplaceholderpositionhtml">trunk/LayoutTests/fast/forms/placeholder-position.html</a></li>
<li><a href="#trunkLayoutTestsfastformsplaceholderpseudostylehtml">trunk/LayoutTests/fast/forms/placeholder-pseudo-style.html</a></li>
<li><a href="#trunkLayoutTestsfastformstextareatextareaplaceholderpaintorder2expectedhtml">trunk/LayoutTests/fast/forms/textarea/textarea-placeholder-paint-order-2-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastformstextareatextareaplaceholderpaintorder2html">trunk/LayoutTests/fast/forms/textarea/textarea-placeholder-paint-order-2.html</a></li>
<li><a href="#trunkLayoutTestsfastformstextareatextareaplaceholderpaintorderhtml">trunk/LayoutTests/fast/forms/textarea/textarea-placeholder-paint-order.html</a></li>
<li><a href="#trunkLayoutTestsfastformstextareaplaceholderpseudostylehtml">trunk/LayoutTests/fast/forms/textarea-placeholder-pseudo-style.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSParserValuescpp">trunk/Source/WebCore/css/CSSParserValues.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSSelectorcpp">trunk/Source/WebCore/css/CSSSelector.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSSelectorh">trunk/Source/WebCore/css/CSSSelector.h</a></li>
<li><a href="#trunkSourceWebCorecssSelectorCheckercpp">trunk/Source/WebCore/css/SelectorChecker.cpp</a></li>
<li><a href="#trunkSourceWebCorecssSelectorPseudoElementTypeMapin">trunk/Source/WebCore/css/SelectorPseudoElementTypeMap.in</a></li>
<li><a href="#trunkSourceWebCorecsshtmlcss">trunk/Source/WebCore/css/html.css</a></li>
<li><a href="#trunkSourceWebCorefeaturesjson">trunk/Source/WebCore/features.json</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowTextControlInnerElementscpp">trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsFilterBarcss">trunk/Source/WebInspectorUI/UserInterface/Views/FilterBar.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsFindBannercss">trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsGoToLineDialogcss">trunk/Source/WebInspectorUI/UserInterface/Views/GoToLineDialog.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsOpenResourceDialogcss">trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSearchBarcss">trunk/Source/WebInspectorUI/UserInterface/Views/SearchBar.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsVisualStyleCommaSeparatedKeywordEditorcss">trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleCommaSeparatedKeywordEditor.css</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastformsplaceholderpseudoelementwithwebkitprefixexpectedhtml">trunk/LayoutTests/fast/forms/placeholder-pseudo-element-with-webkit-prefix-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastformsplaceholderpseudoelementwithwebkitprefixhtml">trunk/LayoutTests/fast/forms/placeholder-pseudo-element-with-webkit-prefix.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/LayoutTests/ChangeLog 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2016-06-14 Benjamin Poulain <bpoulain@apple.com>
+
+ Add the unprefixed version of the pseudo element ::placeholder
+ https://bugs.webkit.org/show_bug.cgi?id=158653
+
+ Reviewed by Dean Jackson.
+
+ * fast/css/css-selector-text-expected.txt:
+ * fast/css/css-selector-text.html:
+ * fast/css/css-set-selector-text-expected.txt:
+ * fast/css/css-set-selector-text.html:
+ This covers CSSOM for the prefixed version.
+
+ * fast/forms/placeholder-pseudo-element-with-webkit-prefix-expected.html: Added.
+ * fast/forms/placeholder-pseudo-element-with-webkit-prefix.html: Added.
+ This verifies both version of the pseudo elements are equivalent.
+
+ * fast/css/pseudo-cache-stale-expected.html:
+ * fast/css/pseudo-cache-stale.html:
+ * fast/forms/input-placeholder-paint-order-2-expected.html:
+ * fast/forms/input-placeholder-paint-order-2.html:
+ * fast/forms/input-placeholder-paint-order.html:
+ * fast/forms/input-placeholder-text-indent.html:
+ * fast/forms/input-user-modify.html:
+ * fast/forms/isindex-placeholder.html:
+ * fast/forms/placeholder-position.html:
+ * fast/forms/placeholder-pseudo-style.html:
+ * fast/forms/textarea-placeholder-pseudo-style.html:
+ * fast/forms/textarea/textarea-placeholder-paint-order-2-expected.html:
+ * fast/forms/textarea/textarea-placeholder-paint-order-2.html:
+ * fast/forms/textarea/textarea-placeholder-paint-order.html:
+
</ins><span class="cx"> 2016-06-14 Doug Russell <d_russell@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Form label text should be exposed as static text if it contains only static text
</span></span></pre></div>
<a id="trunkLayoutTestsfastcsscssselectortextexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/css-selector-text-expected.txt (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/css-selector-text-expected.txt 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/LayoutTests/fast/css/css-selector-text-expected.txt 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -207,6 +207,15 @@
</span><span class="cx"> PASS parseThenSerializeRule('a#b::-webkit-slider-thumb { }') is 'a#b::-webkit-slider-thumb { }'
</span><span class="cx"> PASS parseThenSerializeRule('a[b].c#d::-webkit-slider-thumb { }') is 'a[b].c#d::-webkit-slider-thumb { }'
</span><span class="cx">
</span><ins>+PASS parseThenSerializeRule('a[b]::placeholder { }') is 'a[b]::placeholder { }'
+PASS parseThenSerializeRule('a.b::placeholder { }') is 'a.b::placeholder { }'
+PASS parseThenSerializeRule('a#b::placeholder { }') is 'a#b::placeholder { }'
+PASS parseThenSerializeRule('a[b].c#d::placeholder { }') is 'a[b].c#d::placeholder { }'
+PASS parseThenSerializeRule('a[b]::-webkit-input-placeholder { }') is 'a[b]::-webkit-input-placeholder { }'
+PASS parseThenSerializeRule('a.b::-webkit-input-placeholder { }') is 'a.b::-webkit-input-placeholder { }'
+PASS parseThenSerializeRule('a#b::-webkit-input-placeholder { }') is 'a#b::-webkit-input-placeholder { }'
+PASS parseThenSerializeRule('a[b].c#d::-webkit-input-placeholder { }') is 'a[b].c#d::-webkit-input-placeholder { }'
+
</ins><span class="cx"> PASS parseThenSerializeRule('input:not([type="file"]):focus { }') is 'input:not([type="file"]):focus { }'
</span><span class="cx"> PASS parseThenSerializeRule(':-webkit-any([type="file"]) { }') is ':-webkit-any([type="file"]) { }'
</span><span class="cx"> PASS parseThenSerializeRule(':-webkit-any(:hover) { }') is ':-webkit-any(:hover) { }'
</span></span></pre></div>
<a id="trunkLayoutTestsfastcsscssselectortexthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/css-selector-text.html (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/css-selector-text.html 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/LayoutTests/fast/css/css-selector-text.html 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -296,6 +296,17 @@
</span><span class="cx">
</span><span class="cx"> debug('');
</span><span class="cx">
</span><ins>+testSelectorRoundTrip("a[b]::placeholder");
+testSelectorRoundTrip("a.b::placeholder");
+testSelectorRoundTrip("a#b::placeholder");
+testSelectorRoundTrip("a[b].c#d::placeholder");
+testSelectorRoundTrip("a[b]::-webkit-input-placeholder");
+testSelectorRoundTrip("a.b::-webkit-input-placeholder");
+testSelectorRoundTrip("a#b::-webkit-input-placeholder");
+testSelectorRoundTrip("a[b].c#d::-webkit-input-placeholder");
+
+debug('');
+
</ins><span class="cx"> testSelectorRoundTrip('input:not([type="file"]):focus');
</span><span class="cx"> testSelectorRoundTrip(':-webkit-any([type="file"])');
</span><span class="cx"> testSelectorRoundTrip(':-webkit-any(:hover)');
</span></span></pre></div>
<a id="trunkLayoutTestsfastcsscsssetselectortextexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/css-set-selector-text-expected.txt (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/css-set-selector-text-expected.txt 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/LayoutTests/fast/css/css-set-selector-text-expected.txt 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -209,6 +209,15 @@
</span><span class="cx"> PASS setThenReadSelectorText('a#b::-webkit-slider-thumb') is 'a#b::-webkit-slider-thumb'
</span><span class="cx"> PASS setThenReadSelectorText('a[b].c#d::-webkit-slider-thumb') is 'a[b].c#d::-webkit-slider-thumb'
</span><span class="cx">
</span><ins>+PASS setThenReadSelectorText('a[b]::placeholder') is 'a[b]::placeholder'
+PASS setThenReadSelectorText('a.b::placeholder') is 'a.b::placeholder'
+PASS setThenReadSelectorText('a#b::placeholder') is 'a#b::placeholder'
+PASS setThenReadSelectorText('a[b].c#d::placeholder') is 'a[b].c#d::placeholder'
+PASS setThenReadSelectorText('a[b]::-webkit-input-placeholder') is 'a[b]::-webkit-input-placeholder'
+PASS setThenReadSelectorText('a.b::-webkit-input-placeholder') is 'a.b::-webkit-input-placeholder'
+PASS setThenReadSelectorText('a#b::-webkit-input-placeholder') is 'a#b::-webkit-input-placeholder'
+PASS setThenReadSelectorText('a[b].c#d::-webkit-input-placeholder') is 'a[b].c#d::-webkit-input-placeholder'
+
</ins><span class="cx"> PASS setThenReadSelectorText('input:not([type="file"]):focus') is 'input:not([type="file"]):focus'
</span><span class="cx"> PASS setThenReadSelectorText(':-webkit-any([type="file"])') is ':-webkit-any([type="file"])'
</span><span class="cx"> PASS setThenReadSelectorText(':-webkit-any(:hover)') is ':-webkit-any(:hover)'
</span></span></pre></div>
<a id="trunkLayoutTestsfastcsscsssetselectortexthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/css-set-selector-text.html (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/css-set-selector-text.html 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/LayoutTests/fast/css/css-set-selector-text.html 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -300,6 +300,17 @@
</span><span class="cx">
</span><span class="cx"> debug('');
</span><span class="cx">
</span><ins>+testSelectorRoundTrip("a[b]::placeholder");
+testSelectorRoundTrip("a.b::placeholder");
+testSelectorRoundTrip("a#b::placeholder");
+testSelectorRoundTrip("a[b].c#d::placeholder");
+testSelectorRoundTrip("a[b]::-webkit-input-placeholder");
+testSelectorRoundTrip("a.b::-webkit-input-placeholder");
+testSelectorRoundTrip("a#b::-webkit-input-placeholder");
+testSelectorRoundTrip("a[b].c#d::-webkit-input-placeholder");
+
+debug('');
+
</ins><span class="cx"> testSelectorRoundTrip('input:not([type="file"]):focus');
</span><span class="cx"> testSelectorRoundTrip(':-webkit-any([type="file"])');
</span><span class="cx"> testSelectorRoundTrip(':-webkit-any(:hover)');
</span></span></pre></div>
<a id="trunkLayoutTestsfastcsspseudocachestaleexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/pseudo-cache-stale-expected.html (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/pseudo-cache-stale-expected.html 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/LayoutTests/fast/css/pseudo-cache-stale-expected.html 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> <style>
</span><del>-::-webkit-input-placeholder {
</del><ins>+::placeholder {
</ins><span class="cx"> color: green;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcsspseudocachestalehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/pseudo-cache-stale.html (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/pseudo-cache-stale.html 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/LayoutTests/fast/css/pseudo-cache-stale.html 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> font-size: xx-large;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- .green input::-webkit-input-placeholder {
</del><ins>+ .green input::placeholder {
</ins><span class="cx"> color: green;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestsfastformsinputplaceholderpaintorder2expectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/forms/input-placeholder-paint-order-2-expected.html (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/input-placeholder-paint-order-2-expected.html 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/LayoutTests/fast/forms/input-placeholder-paint-order-2-expected.html 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> zoom: 8;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-input::-webkit-input-placeholder {
</del><ins>+input::placeholder {
</ins><span class="cx"> text-indent: -1px;
</span><span class="cx"> font-weight: bold;
</span><span class="cx"> color: red;
</span></span></pre></div>
<a id="trunkLayoutTestsfastformsinputplaceholderpaintorder2html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/forms/input-placeholder-paint-order-2.html (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/input-placeholder-paint-order-2.html 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/LayoutTests/fast/forms/input-placeholder-paint-order-2.html 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> zoom: 8;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-input::-webkit-input-placeholder {
</del><ins>+input::placeholder {
</ins><span class="cx"> text-indent: -1px;
</span><span class="cx"> font-weight: bold;
</span><span class="cx"> color: red;
</span></span></pre></div>
<a id="trunkLayoutTestsfastformsinputplaceholderpaintorderhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/forms/input-placeholder-paint-order.html (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/input-placeholder-paint-order.html 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/LayoutTests/fast/forms/input-placeholder-paint-order.html 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> zoom: 8;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-input::-webkit-input-placeholder {
</del><ins>+input::placeholder {
</ins><span class="cx"> text-indent: -1px;
</span><span class="cx"> font-weight: bold;
</span><span class="cx"> color: red;
</span></span></pre></div>
<a id="trunkLayoutTestsfastformsinputplaceholdertextindenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/forms/input-placeholder-text-indent.html (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/input-placeholder-text-indent.html 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/LayoutTests/fast/forms/input-placeholder-text-indent.html 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -1,10 +1,10 @@
</span><span class="cx"> <style>
</span><span class="cx"> input { font-size: 30px; width: 500px; }
</span><del>-input.a::-webkit-input-placeholder { text-indent: 0px; }
-input.b::-webkit-input-placeholder { text-indent: 10px; }
-input.c::-webkit-input-placeholder { text-indent: 200px; }
-input.d::-webkit-input-placeholder { text-indent: -10px; }
-input.e::-webkit-input-placeholder { text-indent: 50%; }
</del><ins>+input.a::placeholder { text-indent: 0px; }
+input.b::placeholder { text-indent: 10px; }
+input.c::placeholder { text-indent: 200px; }
+input.d::placeholder { text-indent: -10px; }
+input.e::placeholder { text-indent: 50%; }
</ins><span class="cx"> </style>
</span><span class="cx">
</span><span class="cx"> <div style="direction:ltr">
</span></span></pre></div>
<a id="trunkLayoutTestsfastformsinputusermodifyhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/forms/input-user-modify.html (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/input-user-modify.html 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/LayoutTests/fast/forms/input-user-modify.html 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -8,9 +8,9 @@
</span><span class="cx"> input[type="search"]::-webkit-search-decoration,
</span><span class="cx"> input[type="search"]::-webkit-search-results-decoration,
</span><span class="cx"> input[type="search"]::-webkit-search-results-button,
</span><del>-::-webkit-input-placeholder,
-input::-webkit-input-placeholder,
-isindex::-webkit-input-placeholder,
</del><ins>+::placeholder,
+input::placeholder,
+isindex::placeholder,
</ins><span class="cx"> input[type="button"], input[type="submit"], input[type="reset"],
</span><span class="cx"> input[type="file"]::-webkit-file-upload-button,
</span><span class="cx"> button,
</span></span></pre></div>
<a id="trunkLayoutTestsfastformsisindexplaceholderhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/forms/isindex-placeholder.html (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/isindex-placeholder.html 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/LayoutTests/fast/forms/isindex-placeholder.html 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> <style>
</span><del>- #green-placeholder::-webkit-input-placeholder { color: green; }
</del><ins>+ #green-placeholder::placeholder { color: green; }
</ins><span class="cx"> </style>
</span><span class="cx"> <p>
</span><span class="cx"> Test <tt>&lt;isindex></tt> placeholder styling.
</span></span></pre></div>
<a id="trunkLayoutTestsfastformsplaceholderpositionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/forms/placeholder-position.html (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/placeholder-position.html 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/LayoutTests/fast/forms/placeholder-position.html 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> <style>
</span><del>-.center::-webkit-input-placeholder {
</del><ins>+.center::placeholder {
</ins><span class="cx"> text-align: center;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestsfastformsplaceholderpseudoelementwithwebkitprefixexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/placeholder-pseudo-element-with-webkit-prefix-expected.html (0 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/placeholder-pseudo-element-with-webkit-prefix-expected.html (rev 0)
+++ trunk/LayoutTests/fast/forms/placeholder-pseudo-element-with-webkit-prefix-expected.html 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <style>
+ [placeholder=first]::-webkit-input-placeholder {
+ color: red;
+ background-color: green;
+ }
+ [placeholder=second]::placeholder {
+ color: pink;
+ background-color: blue;
+ }
+
+ </style>
+ <body>
+ <p>This test verifies that ::placeholder and ::-webkit-input-placeholder are styled the same.</p>
+ <div>
+ <input placeholder=first>
+ <input placeholder=second>
+ </div>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastformsplaceholderpseudoelementwithwebkitprefixhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/placeholder-pseudo-element-with-webkit-prefix.html (0 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/placeholder-pseudo-element-with-webkit-prefix.html (rev 0)
+++ trunk/LayoutTests/fast/forms/placeholder-pseudo-element-with-webkit-prefix.html 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <style>
+ [placeholder=first]::placeholder {
+ color: red;
+ background-color: green;
+ }
+ [placeholder=second]::-webkit-input-placeholder {
+ color: pink;
+ background-color: blue;
+ }
+
+ </style>
+ <body>
+ <p>This test verifies that ::placeholder and ::-webkit-input-placeholder are styled the same.</p>
+ <div>
+ <input placeholder=first>
+ <input placeholder=second>
+ </div>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastformsplaceholderpseudostylehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/forms/placeholder-pseudo-style.html (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/placeholder-pseudo-style.html 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/LayoutTests/fast/forms/placeholder-pseudo-style.html 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> <style>
</span><del>-input.red::-webkit-input-placeholder {
</del><ins>+input.red::placeholder {
</ins><span class="cx"> color: rgb(100, 0, 0);
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestsfastformstextareatextareaplaceholderpaintorder2expectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/forms/textarea/textarea-placeholder-paint-order-2-expected.html (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/textarea/textarea-placeholder-paint-order-2-expected.html 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/LayoutTests/fast/forms/textarea/textarea-placeholder-paint-order-2-expected.html 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> zoom: 8;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-textarea::-webkit-input-placeholder {
</del><ins>+textarea::placeholder {
</ins><span class="cx"> text-indent: -1px;
</span><span class="cx"> font-weight: bold;
</span><span class="cx"> color: red;
</span></span></pre></div>
<a id="trunkLayoutTestsfastformstextareatextareaplaceholderpaintorder2html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/forms/textarea/textarea-placeholder-paint-order-2.html (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/textarea/textarea-placeholder-paint-order-2.html 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/LayoutTests/fast/forms/textarea/textarea-placeholder-paint-order-2.html 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> zoom: 8;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-textarea::-webkit-input-placeholder {
</del><ins>+textarea::placeholder {
</ins><span class="cx"> text-indent: -1px;
</span><span class="cx"> font-weight: bold;
</span><span class="cx"> color: red;
</span></span></pre></div>
<a id="trunkLayoutTestsfastformstextareatextareaplaceholderpaintorderhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/forms/textarea/textarea-placeholder-paint-order.html (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/textarea/textarea-placeholder-paint-order.html 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/LayoutTests/fast/forms/textarea/textarea-placeholder-paint-order.html 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> zoom: 8;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-textarea::-webkit-input-placeholder {
</del><ins>+textarea::placeholder {
</ins><span class="cx"> text-indent: -1px;
</span><span class="cx"> font-weight: bold;
</span><span class="cx"> color: red;
</span></span></pre></div>
<a id="trunkLayoutTestsfastformstextareaplaceholderpseudostylehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/forms/textarea-placeholder-pseudo-style.html (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/textarea-placeholder-pseudo-style.html 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/LayoutTests/fast/forms/textarea-placeholder-pseudo-style.html 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> <style>
</span><del>-textarea.red::-webkit-input-placeholder {
</del><ins>+textarea.red::placeholder {
</ins><span class="cx"> color: rgb(100, 0, 0);
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/Source/WebCore/ChangeLog 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -1,3 +1,57 @@
</span><ins>+2016-06-14 Benjamin Poulain <bpoulain@apple.com>
+
+ Add the unprefixed version of the pseudo element ::placeholder
+ https://bugs.webkit.org/show_bug.cgi?id=158653
+
+ Reviewed by Dean Jackson.
+
+ Test: fast/forms/placeholder-pseudo-element-with-webkit-prefix.html
+
+ The pseudo element ::-webkit-input-placeholder is stupidly popular
+ which forces other engines to support this exact name.
+
+ The pseudo-element spec provides a new standard name we can adopt
+ to drop the prefix: https://drafts.csswg.org/css-pseudo-4/#placeholder-pseudo
+
+ This patch does just that, make ::placeholder the standard name to select
+ the placeholder element in the shadow dom of input elements.
+
+ Unlike pseudo classes, we did not have any support for prefixes and aliasing.
+ I want to keep the absurdly efficient matching we currently use for styling
+ because style updates are more common than stylesheet updates.
+ With that constraint in mind, the value of CSSSelector has to be the unprefixed
+ version for both forms of input.
+
+ This leaves us with the problem of displaying the CSSSelector for CSSOM.
+ To differentiate the legacy form from the standard form, I added
+ a new type of PseudoElement: PseudoElementWebKitCustomLegacyPrefixed.
+ When parsing, PseudoElementWebKitCustomLegacyPrefixed let us replace
+ the original value "-webkit-input-placeholder" by the standard value.
+ When creating the selectorText for CSSOM, PseudoElementWebKitCustomLegacyPrefixed
+ let us replace the standard for by the legacy form.
+
+ * css/CSSParserValues.cpp:
+ (WebCore::CSSParserSelector::parsePseudoElementSelector):
+ * css/CSSSelector.cpp:
+ (WebCore::CSSSelector::pseudoId):
+ (WebCore::CSSSelector::selectorText):
+ * css/CSSSelector.h:
+ (WebCore::CSSSelector::isCustomPseudoElement):
+ (WebCore::CSSSelector::isWebKitCustomPseudoElement):
+ * css/SelectorChecker.cpp:
+ (WebCore::SelectorChecker::matchRecursively):
+ * css/SelectorPseudoElementTypeMap.in:
+ * css/html.css:
+ (::placeholder):
+ (input::placeholder, isindex::placeholder):
+ (textarea::placeholder):
+ (::-webkit-input-placeholder): Deleted.
+ (input::-webkit-input-placeholder, isindex::-webkit-input-placeholder): Deleted.
+ (textarea::-webkit-input-placeholder): Deleted.
+ * features.json:
+ * html/shadow/TextControlInnerElements.cpp:
+ (WebCore::TextControlPlaceholderElement::TextControlPlaceholderElement):
+
</ins><span class="cx"> 2016-06-14 Doug Russell <d_russell@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Form label text should be exposed as static text if it contains only static text
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParserValuescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParserValues.cpp (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParserValues.cpp 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/Source/WebCore/css/CSSParserValues.cpp 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -206,6 +206,11 @@
</span><span class="cx"> auto selector = std::make_unique<CSSParserSelector>();
</span><span class="cx"> selector->m_selector->setMatch(CSSSelector::PseudoElement);
</span><span class="cx"> selector->m_selector->setPseudoElementType(pseudoType);
</span><ins>+ if (pseudoType == CSSSelector::PseudoElementWebKitCustomLegacyPrefixed) {
+ ASSERT_WITH_MESSAGE(name == "-webkit-input-placeholder", "-webkit-input-placeholder is the only LegacyPrefix pseudo type.");
+ if (name == "-webkit-input-placeholder")
+ name = AtomicString("placeholder", AtomicString::ConstructFromLiteral);
+ }
</ins><span class="cx"> selector->m_selector->setValue(name);
</span><span class="cx"> return selector.release();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSSelector.cpp (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSSelector.cpp 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/Source/WebCore/css/CSSSelector.cpp 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -305,6 +305,7 @@
</span><span class="cx"> case PseudoElementUnknown:
</span><span class="cx"> case PseudoElementUserAgentCustom:
</span><span class="cx"> case PseudoElementWebKitCustom:
</span><ins>+ case PseudoElementWebKitCustomLegacyPrefixed:
</ins><span class="cx"> return NOPSEUDO;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -660,6 +661,10 @@
</span><span class="cx"> str.append(')');
</span><span class="cx"> break;
</span><span class="cx"> #endif
</span><ins>+ case CSSSelector::PseudoElementWebKitCustomLegacyPrefixed:
+ if (cs->value() == "placeholder")
+ str.appendLiteral("::-webkit-input-placeholder");
+ break;
</ins><span class="cx"> default:
</span><span class="cx"> str.appendLiteral("::");
</span><span class="cx"> str.append(cs->value());
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSSelectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSSelector.h (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSSelector.h 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/Source/WebCore/css/CSSSelector.h 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -189,6 +189,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> PseudoElementUserAgentCustom,
</span><span class="cx"> PseudoElementWebKitCustom,
</span><ins>+
+ // WebKitCustom that appeared in an old prefixed form
+ // and need special handling.
+ PseudoElementWebKitCustomLegacyPrefixed,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum PagePseudoClassType {
</span><span class="lines">@@ -282,6 +286,7 @@
</span><span class="cx"> bool matchesPseudoElement() const;
</span><span class="cx"> bool isUnknownPseudoElement() const;
</span><span class="cx"> bool isCustomPseudoElement() const;
</span><ins>+ bool isWebKitCustomPseudoElement() const;
</ins><span class="cx"> bool isSiblingSelector() const;
</span><span class="cx"> bool isAttributeSelector() const;
</span><span class="cx">
</span><span class="lines">@@ -407,9 +412,17 @@
</span><span class="cx">
</span><span class="cx"> inline bool CSSSelector::isCustomPseudoElement() const
</span><span class="cx"> {
</span><del>- return match() == PseudoElement && (pseudoElementType() == PseudoElementUserAgentCustom || pseudoElementType() == PseudoElementWebKitCustom);
</del><ins>+ return match() == PseudoElement
+ && (pseudoElementType() == PseudoElementUserAgentCustom
+ || pseudoElementType() == PseudoElementWebKitCustom
+ || pseudoElementType() == PseudoElementWebKitCustomLegacyPrefixed);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+inline bool CSSSelector::isWebKitCustomPseudoElement() const
+{
+ return pseudoElementType() == PseudoElementWebKitCustom || pseudoElementType() == PseudoElementWebKitCustomLegacyPrefixed;
+}
+
</ins><span class="cx"> static inline bool pseudoClassIsRelativeToSiblings(CSSSelector::PseudoClassType type)
</span><span class="cx"> {
</span><span class="cx"> return type == CSSSelector::PseudoClassEmpty
</span></span></pre></div>
<a id="trunkSourceWebCorecssSelectorCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SelectorChecker.cpp (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SelectorChecker.cpp 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/Source/WebCore/css/SelectorChecker.cpp 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx"> if (context.element->shadowPseudoId() != context.selector->value())
</span><span class="cx"> return MatchResult::fails(Match::SelectorFailsLocally);
</span><span class="cx">
</span><del>- if (context.selector->pseudoElementType() == CSSSelector::PseudoElementWebKitCustom && root->type() != ShadowRoot::Type::UserAgent)
</del><ins>+ if (context.selector->isWebKitCustomPseudoElement() && root->type() != ShadowRoot::Type::UserAgent)
</ins><span class="cx"> return MatchResult::fails(Match::SelectorFailsLocally);
</span><span class="cx"> } else
</span><span class="cx"> return MatchResult::fails(Match::SelectorFailsLocally);
</span></span></pre></div>
<a id="trunkSourceWebCorecssSelectorPseudoElementTypeMapin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SelectorPseudoElementTypeMap.in (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SelectorPseudoElementTypeMap.in 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/Source/WebCore/css/SelectorPseudoElementTypeMap.in 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -5,6 +5,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> first-letter
</span><span class="cx"> first-line
</span><ins>+placeholder, PseudoElementWebKitCustom
+-webkit-input-placeholder, PseudoElementWebKitCustomLegacyPrefixed
</ins><span class="cx"> -webkit-resizer
</span><span class="cx"> -webkit-scrollbar
</span><span class="cx"> -webkit-scrollbar-button
</span></span></pre></div>
<a id="trunkSourceWebCorecsshtmlcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/html.css (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/html.css 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/Source/WebCore/css/html.css 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -619,13 +619,13 @@
</span><span class="cx"> word-wrap: break-word;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-::-webkit-input-placeholder {
</del><ins>+::placeholder {
</ins><span class="cx"> -webkit-text-security: none;
</span><span class="cx"> color: darkGray;
</span><span class="cx"> pointer-events: none !important;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-input::-webkit-input-placeholder, isindex::-webkit-input-placeholder {
</del><ins>+input::placeholder, isindex::placeholder {
</ins><span class="cx"> white-space: pre;
</span><span class="cx"> word-wrap: normal;
</span><span class="cx"> overflow: hidden;
</span><span class="lines">@@ -752,7 +752,7 @@
</span><span class="cx"> border-color: rgb(188, 188, 188);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-textarea::-webkit-input-placeholder {
</del><ins>+textarea::placeholder {
</ins><span class="cx"> text-indent: 2px;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorefeaturesjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/features.json (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/features.json 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/Source/WebCore/features.json 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -381,7 +381,7 @@
</span><span class="cx"> "url": "http://dev.w3.org/csswg/selectors-4/#placeholder",
</span><span class="cx"> "specification": "CSS Selectors Level 4",
</span><span class="cx"> "description": "The selector :placeholder-shown matches any input element that has a visible placeholder.",
</span><del>- "comment": "Styling the placeholder can be done through the WebKit pseudo-element \"::-webkit-input-placeholder\".",
</del><ins>+ "comment": "Styling the placeholder can be done through the WebKit pseudo-element \"::placeholder\".",
</ins><span class="cx"> "contact": {
</span><span class="cx"> "name": "Benjamin Poulain",
</span><span class="cx"> "twitter": "@awfulben",
</span><span class="lines">@@ -684,4 +684,4 @@
</span><span class="cx"> "description": "Declares HTML fragments that can be cloned and inserted into the document by a script."
</span><span class="cx"> }
</span><span class="cx"> ]
</span><del>-}
</del><span class="cx">\ No newline at end of file
</span><ins>+}
</ins></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowTextControlInnerElementscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> TextControlPlaceholderElement::TextControlPlaceholderElement(Document& document)
</span><span class="cx"> : HTMLDivElement(divTag, document)
</span><span class="cx"> {
</span><del>- setPseudo(AtomicString("-webkit-input-placeholder", AtomicString::ConstructFromLiteral));
</del><ins>+ setPseudo(AtomicString("placeholder", AtomicString::ConstructFromLiteral));
</ins><span class="cx"> setHasCustomStyleResolveCallbacks();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-06-14 Benjamin Poulain <bpoulain@apple.com>
+
+ Add the unprefixed version of the pseudo element ::placeholder
+ https://bugs.webkit.org/show_bug.cgi?id=158653
+
+ Reviewed by Dean Jackson.
+
+ * UserInterface/Views/FilterBar.css:
+ (.filter-bar > input[type="search"]::placeholder):
+ (.filter-bar > input[type="search"]::-webkit-input-placeholder): Deleted.
+ * UserInterface/Views/FindBanner.css:
+ (.find-banner.console-find-banner > input[type="search"]::placeholder):
+ (.find-banner.console-find-banner > input[type="search"]::-webkit-input-placeholder): Deleted.
+ * UserInterface/Views/GoToLineDialog.css:
+ (.go-to-line-dialog > div > input::placeholder):
+ (.go-to-line-dialog > div > input::-webkit-input-placeholder): Deleted.
+ * UserInterface/Views/OpenResourceDialog.css:
+ (.open-resource-dialog > .field > input::placeholder):
+ (.open-resource-dialog > .field > input::-webkit-input-placeholder): Deleted.
+ * UserInterface/Views/SearchBar.css:
+ (.search-bar > input[type="search"]::placeholder):
+ (.search-bar > input[type="search"]::-webkit-input-placeholder): Deleted.
+ * UserInterface/Views/VisualStyleCommaSeparatedKeywordEditor.css:
+
</ins><span class="cx"> 2016-06-14 Nikita Vasilyev <nvasilyev@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Introduce --navigation-bar-height CSS variable
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsFilterBarcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FilterBar.css (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/FilterBar.css 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FilterBar.css 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> height: 22px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.filter-bar > input[type="search"]::-webkit-input-placeholder {
</del><ins>+.filter-bar > input[type="search"]::placeholder {
</ins><span class="cx"> color: hsla(0, 0%, 0%, 0.35);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsFindBannercss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.css (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.css 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.css 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx"> height: 22px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.find-banner.console-find-banner > input[type="search"]::-webkit-input-placeholder {
</del><ins>+.find-banner.console-find-banner > input[type="search"]::placeholder {
</ins><span class="cx"> color: hsla(0, 0%, 0%, 0.35);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsGoToLineDialogcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/GoToLineDialog.css (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/GoToLineDialog.css 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/GoToLineDialog.css 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> outline: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.go-to-line-dialog > div > input::-webkit-input-placeholder {
</del><ins>+.go-to-line-dialog > div > input::placeholder {
</ins><span class="cx"> color: hsl(0, 0%, 52%);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsOpenResourceDialogcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.css (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.css 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.css 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> outline: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.open-resource-dialog > .field > input::-webkit-input-placeholder {
</del><ins>+.open-resource-dialog > .field > input::placeholder {
</ins><span class="cx"> color: hsl(0, 0%, 52%);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSearchBarcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SearchBar.css (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SearchBar.css 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SearchBar.css 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> height: 22px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.search-bar > input[type="search"]::-webkit-input-placeholder {
</del><ins>+.search-bar > input[type="search"]::placeholder {
</ins><span class="cx"> color: hsla(0, 0%, 0%, 0.35);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsVisualStyleCommaSeparatedKeywordEditorcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleCommaSeparatedKeywordEditor.css (202065 => 202066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleCommaSeparatedKeywordEditor.css 2016-06-14 22:02:34 UTC (rev 202065)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleCommaSeparatedKeywordEditor.css 2016-06-14 22:09:33 UTC (rev 202066)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> line-height: 15px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.visual-style-property-container .visual-style-comma-separated-keyword-item-editor::-webkit-input-placeholder,
</del><ins>+.visual-style-property-container .visual-style-comma-separated-keyword-item-editor::placeholder,
</ins><span class="cx"> .visual-style-property-container.comma-separated-keyword-editor > .visual-style-property-value-container > .visual-style-comma-separated-keyword-list > .visual-style-comma-separated-keyword-item > .titles > .subtitle {
</span><span class="cx"> font-size: 10px;
</span><span class="cx"> color: hsla(0, 0%, 100%, 0.7);
</span></span></pre>
</div>
</div>
</body>
</html>