<!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>[164526] 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/164526">164526</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-21 20:09:28 -0800 (Fri, 21 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Inner text element should not use -webkit-user-modify
https://bugs.webkit.org/show_bug.cgi?id=129035
Reviewed by Andreas Kling.
Source/WebCore:
To eliminate the internal use of -webkit-user-modify, use contenteditable attribute in the inner text elements
instead of manually inspecting disabled-ness and readonly-ness in RenderTextControl.
Unfortunately, we still have to manually set UserModify value in RenderTextControl::adjustInnerTextStyle since
RenderTextControl::styleDidChange creates RenderStyle for its inner text from scratch via createInnerTextStyle.
* html/HTMLFieldSetElement.cpp:
(WebCore::HTMLFieldSetElement::disabledStateChanged): Don't use childrenOfType iterator which asserts that DOM
isn't mutated during the traversal since we now set contenteditable attribute inside disabledStateChanged via
updateFromControlElementsAncestorDisabledStateUnder.
* html/HTMLFormControlElement.cpp:
(WebCore::HTMLFormControlElement::parseAttribute): Extracted readOnlyAttributeChanged out of this function so
that HTMLTextFormControl could override it to call updateInnerTextElementEditability.
(WebCore::HTMLFormControlElement::readOnlyAttributeChanged): Ditto.
* html/HTMLFormControlElement.h:
* html/HTMLInputElement.cpp:
(WebCore::HTMLInputElement::didAddUserAgentShadowRoot): Call updateInnerTextElementEditability after creating
shadow DOM for the current input type.
(WebCore::HTMLInputElement::updateType): Ditto.
(WebCore::HTMLInputElement::parseAttribute): Ditto.
* html/HTMLTextAreaElement.cpp:
(WebCore::HTMLTextAreaElement::didAddUserAgentShadowRoot): Call updateInnerTextElementEditability.
* html/HTMLTextFormControlElement.cpp:
(WebCore::HTMLTextFormControlElement::disabledStateChanged): Added to update contenteditable attribute since
the editability of the inner text element depends on disabled-ness of the element.
(WebCore::HTMLTextFormControlElement::readOnlyAttributeChanged): Ditto for the readonly-ness of the element.
(WebCore::HTMLTextFormControlElement::updateInnerTextElementEditability): Added.
* html/HTMLTextFormControlElement.h:
* rendering/RenderTextControl.cpp:
(WebCore::RenderTextControl::adjustInnerTextStyle): Use the inner text element's presentationAttributeStyle() to
compute the appropriate EUserModify value instead of hard-coding it here.
* rendering/RenderTextControl.h:
LayoutTests:
Rebaselined tests as the user agent shadow DOM of input and textarea elements now have contenteditable attribute.
* editing/input/paste-text-ending-with-interchange-newline-expected.txt:
* editing/inserting/5607069-2-expected.txt:
* editing/inserting/5607069-3-expected.txt:
* editing/pasteboard/copy-image-with-alt-text-expected.txt:
* editing/pasteboard/copy-null-characters-expected.txt:
* editing/pasteboard/nested-blocks-with-text-area-expected.txt:
* editing/pasteboard/nested-blocks-with-text-field-expected.txt:
* editing/selection/dump-as-markup-expected.txt:
* editing/selection/dump-as-markup-form-text-expected.txt:
* fast/forms/suggested-value-after-setvalue-expected.txt:
* fast/forms/suggested-value-expected.txt:
* fast/parser/object-with-textarea-fallback-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestseditinginputpastetextendingwithinterchangenewlineexpectedtxt">trunk/LayoutTests/editing/input/paste-text-ending-with-interchange-newline-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditinginserting56070692expectedtxt">trunk/LayoutTests/editing/inserting/5607069-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditinginserting56070693expectedtxt">trunk/LayoutTests/editing/inserting/5607069-3-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingpasteboardcopyimagewithalttextexpectedtxt">trunk/LayoutTests/editing/pasteboard/copy-image-with-alt-text-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingpasteboardcopynullcharactersexpectedtxt">trunk/LayoutTests/editing/pasteboard/copy-null-characters-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingpasteboardnestedblockswithtextareaexpectedtxt">trunk/LayoutTests/editing/pasteboard/nested-blocks-with-text-area-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingpasteboardnestedblockswithtextfieldexpectedtxt">trunk/LayoutTests/editing/pasteboard/nested-blocks-with-text-field-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingselectiondumpasmarkupexpectedtxt">trunk/LayoutTests/editing/selection/dump-as-markup-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingselectiondumpasmarkupformtextexpectedtxt">trunk/LayoutTests/editing/selection/dump-as-markup-form-text-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastformssuggestedvalueaftersetvalueexpectedtxt">trunk/LayoutTests/fast/forms/suggested-value-after-setvalue-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastformssuggestedvalueexpectedtxt">trunk/LayoutTests/fast/forms/suggested-value-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastparserobjectwithtextareafallbackexpectedtxt">trunk/LayoutTests/fast/parser/object-with-textarea-fallback-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFieldSetElementcpp">trunk/Source/WebCore/html/HTMLFieldSetElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormControlElementcpp">trunk/Source/WebCore/html/HTMLFormControlElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormControlElementh">trunk/Source/WebCore/html/HTMLFormControlElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLInputElementcpp">trunk/Source/WebCore/html/HTMLInputElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTextAreaElementcpp">trunk/Source/WebCore/html/HTMLTextAreaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTextFormControlElementcpp">trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTextFormControlElementh">trunk/Source/WebCore/html/HTMLTextFormControlElement.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextControlcpp">trunk/Source/WebCore/rendering/RenderTextControl.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextControlh">trunk/Source/WebCore/rendering/RenderTextControl.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164525 => 164526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-22 03:56:33 UTC (rev 164525)
+++ trunk/LayoutTests/ChangeLog 2014-02-22 04:09:28 UTC (rev 164526)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-02-21 Ryosuke Niwa <rniwa@webkit.org>
+
+ Inner text element should not use -webkit-user-modify
+ https://bugs.webkit.org/show_bug.cgi?id=129035
+
+ Reviewed by Andreas Kling.
+
+ Rebaselined tests as the user agent shadow DOM of input and textarea elements now have contenteditable attribute.
+
+ * editing/input/paste-text-ending-with-interchange-newline-expected.txt:
+ * editing/inserting/5607069-2-expected.txt:
+ * editing/inserting/5607069-3-expected.txt:
+ * editing/pasteboard/copy-image-with-alt-text-expected.txt:
+ * editing/pasteboard/copy-null-characters-expected.txt:
+ * editing/pasteboard/nested-blocks-with-text-area-expected.txt:
+ * editing/pasteboard/nested-blocks-with-text-field-expected.txt:
+ * editing/selection/dump-as-markup-expected.txt:
+ * editing/selection/dump-as-markup-form-text-expected.txt:
+ * fast/forms/suggested-value-after-setvalue-expected.txt:
+ * fast/forms/suggested-value-expected.txt:
+ * fast/parser/object-with-textarea-fallback-expected.txt:
+
</ins><span class="cx"> 2014-02-21 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> After copy and paste, cursor may appear to be above the bottom of content
</span></span></pre></div>
<a id="trunkLayoutTestseditinginputpastetextendingwithinterchangenewlineexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/input/paste-text-ending-with-interchange-newline-expected.txt (164525 => 164526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/input/paste-text-ending-with-interchange-newline-expected.txt 2014-02-22 03:56:33 UTC (rev 164525)
+++ trunk/LayoutTests/editing/input/paste-text-ending-with-interchange-newline-expected.txt 2014-02-22 04:09:28 UTC (rev 164526)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> This tests pasting a text with an interchange new line at the end. WebKit shouldn't insert a new line.
</span><span class="cx"> | <shadow:root>
</span><span class="cx"> | <div>
</span><ins>+| contenteditable="plaintext-only"
</ins><span class="cx"> | "abc def"
</span></span></pre></div>
<a id="trunkLayoutTestseditinginserting56070692expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/inserting/5607069-2-expected.txt (164525 => 164526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/inserting/5607069-2-expected.txt 2014-02-22 03:56:33 UTC (rev 164525)
+++ trunk/LayoutTests/editing/inserting/5607069-2-expected.txt 2014-02-22 04:09:28 UTC (rev 164526)
</span><span class="lines">@@ -4,9 +4,11 @@
</span><span class="cx"> | this.value=""
</span><span class="cx"> | <shadow:root>
</span><span class="cx"> | <div>
</span><ins>+| contenteditable="plaintext-only"
</ins><span class="cx"> | <br>
</span><span class="cx"> | <input>
</span><span class="cx"> | type="text"
</span><span class="cx"> | this.value=""
</span><span class="cx"> | <shadow:root>
</span><span class="cx"> | <div>
</span><ins>+| contenteditable="plaintext-only"
</ins></span></pre></div>
<a id="trunkLayoutTestseditinginserting56070693expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/inserting/5607069-3-expected.txt (164525 => 164526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/inserting/5607069-3-expected.txt 2014-02-22 03:56:33 UTC (rev 164525)
+++ trunk/LayoutTests/editing/inserting/5607069-3-expected.txt 2014-02-22 04:09:28 UTC (rev 164526)
</span><span class="lines">@@ -6,6 +6,7 @@
</span><span class="cx"> | this.value=""
</span><span class="cx"> | <shadow:root>
</span><span class="cx"> | <div>
</span><ins>+| contenteditable="plaintext-only"
</ins><span class="cx"> | "x"
</span><span class="cx"> | <br>
</span><span class="cx"> | "<#selection-caret>x"
</span><span class="lines">@@ -14,3 +15,4 @@
</span><span class="cx"> | this.value=""
</span><span class="cx"> | <shadow:root>
</span><span class="cx"> | <div>
</span><ins>+| contenteditable="plaintext-only"
</ins></span></pre></div>
<a id="trunkLayoutTestseditingpasteboardcopyimagewithalttextexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/pasteboard/copy-image-with-alt-text-expected.txt (164525 => 164526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/pasteboard/copy-image-with-alt-text-expected.txt 2014-02-22 03:56:33 UTC (rev 164525)
+++ trunk/LayoutTests/editing/pasteboard/copy-image-with-alt-text-expected.txt 2014-02-22 04:09:28 UTC (rev 164526)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> Dump of markup 1:
</span><span class="cx"> | <shadow:root>
</span><span class="cx"> | <div>
</span><ins>+| contenteditable="plaintext-only"
</ins><span class="cx"> | "Here is an emoticon [], some more text [], an empty alt tag [], no alt tag [] and two consecutive images [].
</span><span class="cx">
</span><span class="cx"> "
</span><span class="lines">@@ -17,6 +18,7 @@
</span><span class="cx"> Dump of markup 3:
</span><span class="cx"> | <shadow:root>
</span><span class="cx"> | <div>
</span><ins>+| contenteditable="plaintext-only"
</ins><span class="cx"> | "Here is an emoticon [:)], some more text [sample text], an empty alt tag [], no alt tag [] and two consecutive images [firstsecond].
</span><span class="cx">
</span><span class="cx"> "
</span></span></pre></div>
<a id="trunkLayoutTestseditingpasteboardcopynullcharactersexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/pasteboard/copy-null-characters-expected.txt (164525 => 164526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/pasteboard/copy-null-characters-expected.txt 2014-02-22 03:56:33 UTC (rev 164525)
+++ trunk/LayoutTests/editing/pasteboard/copy-null-characters-expected.txt 2014-02-22 04:09:28 UTC (rev 164526)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> green"
</span><span class="cx"> | <shadow:root>
</span><span class="cx"> | <div>
</span><ins>+| contenteditable="plaintext-only"
</ins><span class="cx"> | "Copy paste mebold
</span><span class="cx">
</span><span class="cx"> Copy paste me
</span></span></pre></div>
<a id="trunkLayoutTestseditingpasteboardnestedblockswithtextareaexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/pasteboard/nested-blocks-with-text-area-expected.txt (164525 => 164526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/pasteboard/nested-blocks-with-text-area-expected.txt 2014-02-22 03:56:33 UTC (rev 164525)
+++ trunk/LayoutTests/editing/pasteboard/nested-blocks-with-text-area-expected.txt 2014-02-22 04:09:28 UTC (rev 164526)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> | " "
</span><span class="cx"> | <shadow:root>
</span><span class="cx"> | <div>
</span><ins>+| contenteditable="plaintext-only"
</ins><span class="cx"> | " "
</span><span class="cx"> | "
</span><span class="cx"> x<#selection-caret>
</span></span></pre></div>
<a id="trunkLayoutTestseditingpasteboardnestedblockswithtextfieldexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/pasteboard/nested-blocks-with-text-field-expected.txt (164525 => 164526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/pasteboard/nested-blocks-with-text-field-expected.txt 2014-02-22 03:56:33 UTC (rev 164525)
+++ trunk/LayoutTests/editing/pasteboard/nested-blocks-with-text-field-expected.txt 2014-02-22 04:09:28 UTC (rev 164526)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> | this.value=""
</span><span class="cx"> | <shadow:root>
</span><span class="cx"> | <div>
</span><ins>+| contenteditable="plaintext-only"
</ins><span class="cx"> | "
</span><span class="cx"> x<#selection-caret>
</span><span class="cx"> "
</span></span></pre></div>
<a id="trunkLayoutTestseditingselectiondumpasmarkupexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/selection/dump-as-markup-expected.txt (164525 => 164526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/selection/dump-as-markup-expected.txt 2014-02-22 03:56:33 UTC (rev 164525)
+++ trunk/LayoutTests/editing/selection/dump-as-markup-expected.txt 2014-02-22 04:09:28 UTC (rev 164526)
</span><span class="lines">@@ -20,6 +20,7 @@
</span><span class="cx"> | this.value=""
</span><span class="cx"> | <shadow:root>
</span><span class="cx"> | <div>
</span><ins>+| contenteditable="plaintext-only"
</ins><span class="cx"> | "
</span><span class="cx"> "
</span><span class="cx"> | <div>
</span></span></pre></div>
<a id="trunkLayoutTestseditingselectiondumpasmarkupformtextexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/selection/dump-as-markup-form-text-expected.txt (164525 => 164526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/selection/dump-as-markup-form-text-expected.txt 2014-02-22 03:56:33 UTC (rev 164525)
+++ trunk/LayoutTests/editing/selection/dump-as-markup-form-text-expected.txt 2014-02-22 04:09:28 UTC (rev 164526)
</span><span class="lines">@@ -13,6 +13,7 @@
</span><span class="cx"> | this.value="replaced"
</span><span class="cx"> | <shadow:root>
</span><span class="cx"> | <div>
</span><ins>+| contenteditable="plaintext-only"
</ins><span class="cx"> | "replaced"
</span><span class="cx"> | "
</span><span class="cx"> "
</span><span class="lines">@@ -21,6 +22,7 @@
</span><span class="cx"> | "original"
</span><span class="cx"> | <shadow:root>
</span><span class="cx"> | <div>
</span><ins>+| contenteditable="plaintext-only"
</ins><span class="cx"> | "replaced"
</span><span class="cx"> | "
</span><span class="cx"> "
</span></span></pre></div>
<a id="trunkLayoutTestsfastformssuggestedvalueaftersetvalueexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/forms/suggested-value-after-setvalue-expected.txt (164525 => 164526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/suggested-value-after-setvalue-expected.txt 2014-02-22 03:56:33 UTC (rev 164525)
+++ trunk/LayoutTests/fast/forms/suggested-value-after-setvalue-expected.txt 2014-02-22 04:09:28 UTC (rev 164526)
</span><span class="lines">@@ -8,6 +8,7 @@
</span><span class="cx"> | this.value="initial value"
</span><span class="cx"> | <shadow:root>
</span><span class="cx"> | <div>
</span><ins>+| contenteditable="plaintext-only"
</ins><span class="cx"> | "suggested value"
</span><span class="cx"> | "input.value: initial value"
</span><span class="cx"> | "internals.suggestedValue(input): suggested value"
</span><span class="lines">@@ -22,6 +23,7 @@
</span><span class="cx"> | this.value="new value"
</span><span class="cx"> | <shadow:root>
</span><span class="cx"> | <div>
</span><ins>+| contenteditable="plaintext-only"
</ins><span class="cx"> | "new value"
</span><span class="cx"> | "input.value: new value"
</span><span class="cx"> | "internals.suggestedValue(input): "
</span></span></pre></div>
<a id="trunkLayoutTestsfastformssuggestedvalueexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/forms/suggested-value-expected.txt (164525 => 164526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/suggested-value-expected.txt 2014-02-22 03:56:33 UTC (rev 164525)
+++ trunk/LayoutTests/fast/forms/suggested-value-expected.txt 2014-02-22 04:09:28 UTC (rev 164526)
</span><span class="lines">@@ -7,6 +7,7 @@
</span><span class="cx"> | this.value="initial value"
</span><span class="cx"> | <shadow:root>
</span><span class="cx"> | <div>
</span><ins>+| contenteditable="plaintext-only"
</ins><span class="cx"> | "suggested value"
</span><span class="cx"> | "input.value: initial value"
</span><span class="cx"> | "internals.suggestedValue(input): suggested value"
</span></span></pre></div>
<a id="trunkLayoutTestsfastparserobjectwithtextareafallbackexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/parser/object-with-textarea-fallback-expected.txt (164525 => 164526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/parser/object-with-textarea-fallback-expected.txt 2014-02-22 03:56:33 UTC (rev 164525)
+++ trunk/LayoutTests/fast/parser/object-with-textarea-fallback-expected.txt 2014-02-22 04:09:28 UTC (rev 164526)
</span><span class="lines">@@ -15,6 +15,7 @@
</span><span class="cx"> | this.value=""
</span><span class="cx"> | <shadow:root>
</span><span class="cx"> | <div>
</span><ins>+| contenteditable="plaintext-only"
</ins><span class="cx"> | "
</span><span class="cx"> "
</span><span class="cx"> | "
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164525 => 164526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-22 03:56:33 UTC (rev 164525)
+++ trunk/Source/WebCore/ChangeLog 2014-02-22 04:09:28 UTC (rev 164526)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2014-02-21 Ryosuke Niwa <rniwa@webkit.org>
+
+ Inner text element should not use -webkit-user-modify
+ https://bugs.webkit.org/show_bug.cgi?id=129035
+
+ Reviewed by Andreas Kling.
+
+ To eliminate the internal use of -webkit-user-modify, use contenteditable attribute in the inner text elements
+ instead of manually inspecting disabled-ness and readonly-ness in RenderTextControl.
+
+ Unfortunately, we still have to manually set UserModify value in RenderTextControl::adjustInnerTextStyle since
+ RenderTextControl::styleDidChange creates RenderStyle for its inner text from scratch via createInnerTextStyle.
+
+ * html/HTMLFieldSetElement.cpp:
+ (WebCore::HTMLFieldSetElement::disabledStateChanged): Don't use childrenOfType iterator which asserts that DOM
+ isn't mutated during the traversal since we now set contenteditable attribute inside disabledStateChanged via
+ updateFromControlElementsAncestorDisabledStateUnder.
+
+ * html/HTMLFormControlElement.cpp:
+ (WebCore::HTMLFormControlElement::parseAttribute): Extracted readOnlyAttributeChanged out of this function so
+ that HTMLTextFormControl could override it to call updateInnerTextElementEditability.
+ (WebCore::HTMLFormControlElement::readOnlyAttributeChanged): Ditto.
+ * html/HTMLFormControlElement.h:
+
+ * html/HTMLInputElement.cpp:
+ (WebCore::HTMLInputElement::didAddUserAgentShadowRoot): Call updateInnerTextElementEditability after creating
+ shadow DOM for the current input type.
+ (WebCore::HTMLInputElement::updateType): Ditto.
+ (WebCore::HTMLInputElement::parseAttribute): Ditto.
+
+ * html/HTMLTextAreaElement.cpp:
+ (WebCore::HTMLTextAreaElement::didAddUserAgentShadowRoot): Call updateInnerTextElementEditability.
+
+ * html/HTMLTextFormControlElement.cpp:
+ (WebCore::HTMLTextFormControlElement::disabledStateChanged): Added to update contenteditable attribute since
+ the editability of the inner text element depends on disabled-ness of the element.
+ (WebCore::HTMLTextFormControlElement::readOnlyAttributeChanged): Ditto for the readonly-ness of the element.
+ (WebCore::HTMLTextFormControlElement::updateInnerTextElementEditability): Added.
+ * html/HTMLTextFormControlElement.h:
+
+ * rendering/RenderTextControl.cpp:
+ (WebCore::RenderTextControl::adjustInnerTextStyle): Use the inner text element's presentationAttributeStyle() to
+ compute the appropriate EUserModify value instead of hard-coding it here.
+ * rendering/RenderTextControl.h:
+
</ins><span class="cx"> 2014-02-21 ChangSeok Oh <changseok.oh@collabora.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Support WEBGL_draw_buffers extension.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFieldSetElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFieldSetElement.cpp (164525 => 164526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFieldSetElement.cpp 2014-02-22 03:56:33 UTC (rev 164525)
+++ trunk/Source/WebCore/html/HTMLFieldSetElement.cpp 2014-02-22 04:09:28 UTC (rev 164526)
</span><span class="lines">@@ -92,13 +92,13 @@
</span><span class="cx">
</span><span class="cx"> bool thisFieldsetIsDisabled = hasAttribute(disabledAttr);
</span><span class="cx"> bool hasSeenFirstLegendElement = false;
</span><del>- for (auto& control : childrenOfType<HTMLElement>(*this)) {
</del><ins>+ for (HTMLElement* control = Traversal<HTMLElement>::firstChild(this); control; control = Traversal<HTMLElement>::nextSibling(control)) {
</ins><span class="cx"> if (!hasSeenFirstLegendElement && isHTMLLegendElement(control)) {
</span><span class="cx"> hasSeenFirstLegendElement = true;
</span><del>- updateFromControlElementsAncestorDisabledStateUnder(control, false /* isDisabled */);
</del><ins>+ updateFromControlElementsAncestorDisabledStateUnder(*control, false /* isDisabled */);
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><del>- updateFromControlElementsAncestorDisabledStateUnder(control, thisFieldsetIsDisabled);
</del><ins>+ updateFromControlElementsAncestorDisabledStateUnder(*control, thisFieldsetIsDisabled);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormControlElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormControlElement.cpp (164525 => 164526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2014-02-22 03:56:33 UTC (rev 164525)
+++ trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2014-02-22 04:09:28 UTC (rev 164526)
</span><span class="lines">@@ -135,12 +135,8 @@
</span><span class="cx"> } else if (name == readonlyAttr) {
</span><span class="cx"> bool wasReadOnly = m_isReadOnly;
</span><span class="cx"> m_isReadOnly = !value.isNull();
</span><del>- if (wasReadOnly != m_isReadOnly) {
- setNeedsWillValidateCheck();
- setNeedsStyleRecalc();
- if (renderer() && renderer()->style().hasAppearance())
- renderer()->theme().stateChanged(renderer(), ReadOnlyState);
- }
</del><ins>+ if (wasReadOnly != m_isReadOnly)
+ readOnlyAttributeChanged();
</ins><span class="cx"> } else if (name == requiredAttr) {
</span><span class="cx"> bool wasRequired = m_isRequired;
</span><span class="cx"> m_isRequired = !value.isNull();
</span><span class="lines">@@ -167,6 +163,14 @@
</span><span class="cx"> renderer()->theme().stateChanged(renderer(), EnabledState);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void HTMLFormControlElement::readOnlyAttributeChanged()
+{
+ setNeedsWillValidateCheck();
+ setNeedsStyleRecalc();
+ if (renderer() && renderer()->style().hasAppearance())
+ renderer()->theme().stateChanged(renderer(), ReadOnlyState);
+}
+
</ins><span class="cx"> void HTMLFormControlElement::requiredAttributeChanged()
</span><span class="cx"> {
</span><span class="cx"> setNeedsValidityCheck();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormControlElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormControlElement.h (164525 => 164526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormControlElement.h 2014-02-22 03:56:33 UTC (rev 164525)
+++ trunk/Source/WebCore/html/HTMLFormControlElement.h 2014-02-22 04:09:28 UTC (rev 164526)
</span><span class="lines">@@ -123,9 +123,10 @@
</span><span class="cx"> bool disabledByAncestorFieldset() const { return m_disabledByAncestorFieldset; }
</span><span class="cx">
</span><span class="cx"> virtual void parseAttribute(const QualifiedName&, const AtomicString&) override;
</span><del>- virtual void requiredAttributeChanged();
</del><span class="cx"> virtual void disabledAttributeChanged();
</span><span class="cx"> virtual void disabledStateChanged();
</span><ins>+ virtual void readOnlyAttributeChanged();
+ virtual void requiredAttributeChanged();
</ins><span class="cx"> virtual void didAttachRenderers() override;
</span><span class="cx"> virtual InsertionNotificationRequest insertedInto(ContainerNode&) override;
</span><span class="cx"> virtual void removedFrom(ContainerNode&) override;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLInputElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLInputElement.cpp (164525 => 164526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLInputElement.cpp 2014-02-22 03:56:33 UTC (rev 164525)
+++ trunk/Source/WebCore/html/HTMLInputElement.cpp 2014-02-22 04:09:28 UTC (rev 164526)
</span><span class="lines">@@ -149,6 +149,7 @@
</span><span class="cx"> void HTMLInputElement::didAddUserAgentShadowRoot(ShadowRoot*)
</span><span class="cx"> {
</span><span class="cx"> m_inputType->createShadowSubtree();
</span><ins>+ updateInnerTextElementEditability();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HTMLInputElement::~HTMLInputElement()
</span><span class="lines">@@ -473,6 +474,7 @@
</span><span class="cx">
</span><span class="cx"> m_inputType = std::move(newType);
</span><span class="cx"> m_inputType->createShadowSubtree();
</span><ins>+ updateInnerTextElementEditability();
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> bool hasTouchEventHandler = m_inputType->hasTouchEventHandler();
</span><span class="lines">@@ -735,6 +737,7 @@
</span><span class="cx"> else if (name == webkitspeechAttr) {
</span><span class="cx"> m_inputType->destroyShadowSubtree();
</span><span class="cx"> m_inputType->createShadowSubtree();
</span><ins>+ updateInnerTextElementEditability();
</ins><span class="cx">
</span><span class="cx"> // This renderer and its children have quite different layouts and styles depending on
</span><span class="cx"> // whether the speech button is visible or not. So we reset the whole thing and recreate
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTextAreaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTextAreaElement.cpp (164525 => 164526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTextAreaElement.cpp 2014-02-22 03:56:33 UTC (rev 164525)
+++ trunk/Source/WebCore/html/HTMLTextAreaElement.cpp 2014-02-22 04:09:28 UTC (rev 164526)
</span><span class="lines">@@ -110,6 +110,7 @@
</span><span class="cx"> void HTMLTextAreaElement::didAddUserAgentShadowRoot(ShadowRoot* root)
</span><span class="cx"> {
</span><span class="cx"> root->appendChild(TextControlInnerTextElement::create(document()), ASSERT_NO_EXCEPTION);
</span><ins>+ updateInnerTextElementEditability();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const AtomicString& HTMLTextAreaElement::formControlType() const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTextFormControlElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp (164525 => 164526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp 2014-02-22 03:56:33 UTC (rev 164525)
+++ trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp 2014-02-22 04:09:28 UTC (rev 164526)
</span><span class="lines">@@ -493,6 +493,24 @@
</span><span class="cx"> HTMLFormControlElementWithState::parseAttribute(name, value);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void HTMLTextFormControlElement::disabledStateChanged()
+{
+ HTMLFormControlElementWithState::disabledStateChanged();
+ updateInnerTextElementEditability();
+}
+
+void HTMLTextFormControlElement::readOnlyAttributeChanged()
+{
+ HTMLFormControlElementWithState::disabledAttributeChanged();
+ updateInnerTextElementEditability();
+}
+
+void HTMLTextFormControlElement::updateInnerTextElementEditability()
+{
+ if (TextControlInnerTextElement* innerText = innerTextElement())
+ innerText->setAttribute(contenteditableAttr, isDisabledOrReadOnly() ? "false" : "plaintext-only");
+}
+
</ins><span class="cx"> bool HTMLTextFormControlElement::lastChangeWasUserEdit() const
</span><span class="cx"> {
</span><span class="cx"> if (!isTextFormControl())
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTextFormControlElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTextFormControlElement.h (164525 => 164526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTextFormControlElement.h 2014-02-22 03:56:33 UTC (rev 164525)
+++ trunk/Source/WebCore/html/HTMLTextFormControlElement.h 2014-02-22 04:09:28 UTC (rev 164526)
</span><span class="lines">@@ -99,6 +99,10 @@
</span><span class="cx">
</span><span class="cx"> virtual void parseAttribute(const QualifiedName&, const AtomicString&) override;
</span><span class="cx">
</span><ins>+ virtual void disabledStateChanged() override;
+ virtual void readOnlyAttributeChanged() override;
+ void updateInnerTextElementEditability();
+
</ins><span class="cx"> void cacheSelection(int start, int end, TextFieldSelectionDirection direction)
</span><span class="cx"> {
</span><span class="cx"> m_cachedSelectionStart = start;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextControlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTextControl.cpp (164525 => 164526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTextControl.cpp 2014-02-22 03:56:33 UTC (rev 164525)
+++ trunk/Source/WebCore/rendering/RenderTextControl.cpp 2014-02-22 04:09:28 UTC (rev 164526)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "RenderTextControl.h"
</span><span class="cx">
</span><ins>+#include "CSSPrimitiveValueMappings.h"
</ins><span class="cx"> #include "HTMLTextFormControlElement.h"
</span><span class="cx"> #include "HitTestResult.h"
</span><span class="cx"> #include "RenderText.h"
</span><span class="lines">@@ -29,6 +30,7 @@
</span><span class="cx"> #include "RenderTheme.h"
</span><span class="cx"> #include "ScrollbarTheme.h"
</span><span class="cx"> #include "StyleInheritedData.h"
</span><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "TextControlInnerElements.h"
</span><span class="cx"> #include "VisiblePosition.h"
</span><span class="cx"> #include <wtf/unicode/CharacterNames.h>
</span><span class="lines">@@ -72,15 +74,6 @@
</span><span class="cx"> textFormControlElement().updatePlaceholderVisibility(false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool updateUserModifyProperty(const HTMLTextFormControlElement& element, RenderStyle* style)
-{
- bool isDisabled = element.isDisabledFormControl();
- bool isReadOnlyControl = element.isReadOnly();
-
- style->setUserModify((isReadOnlyControl || isDisabled) ? READ_ONLY : READ_WRITE_PLAINTEXT_ONLY);
- return isDisabled;
-}
-
</del><span class="cx"> void RenderTextControl::adjustInnerTextStyle(const RenderStyle* startStyle, RenderStyle* textBlockStyle) const
</span><span class="cx"> {
</span><span class="cx"> // The inner block, if present, always has its direction set to LTR,
</span><span class="lines">@@ -88,8 +81,16 @@
</span><span class="cx"> textBlockStyle->setDirection(style().direction());
</span><span class="cx"> textBlockStyle->setUnicodeBidi(style().unicodeBidi());
</span><span class="cx">
</span><del>- bool disabled = updateUserModifyProperty(textFormControlElement(), textBlockStyle);
- if (disabled)
</del><ins>+ HTMLTextFormControlElement& control = textFormControlElement();
+ if (HTMLElement* innerText = control.innerTextElement()) {
+ if (const StyleProperties* properties = innerText->presentationAttributeStyle()) {
+ RefPtr<CSSValue> value = properties->getPropertyCSSValue(CSSPropertyWebkitUserModify);
+ if (value && value->isPrimitiveValue())
+ textBlockStyle->setUserModify(toCSSPrimitiveValue(*value));
+ }
+ }
+
+ if (control.isDisabledFormControl())
</ins><span class="cx"> textBlockStyle->setColor(theme().disabledTextColor(textBlockStyle->visitedDependentColor(CSSPropertyColor), startStyle->visitedDependentColor(CSSPropertyBackgroundColor)));
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (textBlockStyle->textSecurity() != TSNONE && !textBlockStyle->isLeftToRightDirection()) {
</span><span class="lines">@@ -135,13 +136,6 @@
</span><span class="cx"> return unitWidth;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderTextControl::updateFromElement()
-{
- TextControlInnerTextElement* innerText = innerTextElement();
- if (innerText && innerText->renderer())
- updateUserModifyProperty(textFormControlElement(), &innerText->renderer()->style());
-}
-
</del><span class="cx"> int RenderTextControl::scrollbarThickness() const
</span><span class="cx"> {
</span><span class="cx"> // FIXME: We should get the size of the scrollbar from the RenderTheme instead.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextControlh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTextControl.h (164525 => 164526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTextControl.h 2014-02-22 03:56:33 UTC (rev 164525)
+++ trunk/Source/WebCore/rendering/RenderTextControl.h 2014-02-22 04:09:28 UTC (rev 164526)
</span><span class="lines">@@ -67,7 +67,6 @@
</span><span class="cx"> virtual LayoutUnit preferredContentLogicalWidth(float charWidth) const = 0;
</span><span class="cx"> virtual LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, LayoutUnit nonContentHeight) const = 0;
</span><span class="cx">
</span><del>- virtual void updateFromElement() override;
</del><span class="cx"> virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
</span><span class="cx"> virtual RenderObject* layoutSpecialExcludedChild(bool relayoutChildren) override;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>