<!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>[206404] 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/206404">206404</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-09-26 16:51:17 -0700 (Mon, 26 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Setter on style element's textContent or cssText doesn't trigger style recalc
https://bugs.webkit.org/show_bug.cgi?id=160331
<rdar://problem/27609715>
Reviewed by Ryosuke Niwa and Daniel Bates.
Source/WebCore:
We would not notify the parent when text node content changed in a shadow tree.
Test: fast/shadow-dom/shadow-style-text-mutation.html
* dom/AuthorStyleSheets.cpp:
(WebCore::AuthorStyleSheets::updateActiveStyleSheets):
Invalidate shadow root children instead of the root itself when doing full invalidation.
The invalidity bits have no meaning for non-element, non-texts.
* dom/CharacterData.cpp:
(WebCore::CharacterData::parserAppendData):
(WebCore::CharacterData::setDataAndUpdate):
(WebCore::CharacterData::notifyParentAfterChange):
Add a helper and call it also in shadow trees.
(WebCore::CharacterData::dispatchModifiedEvent):
* dom/CharacterData.h:
LayoutTests:
* fast/shadow-dom/shadow-style-text-mutation-expected.html: Added.
* fast/shadow-dom/shadow-style-text-mutation.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomAuthorStyleSheetscpp">trunk/Source/WebCore/dom/AuthorStyleSheets.cpp</a></li>
<li><a href="#trunkSourceWebCoredomCharacterDatacpp">trunk/Source/WebCore/dom/CharacterData.cpp</a></li>
<li><a href="#trunkSourceWebCoredomCharacterDatah">trunk/Source/WebCore/dom/CharacterData.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastshadowdomshadowstyletextmutationexpectedhtml">trunk/LayoutTests/fast/shadow-dom/shadow-style-text-mutation-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshadowdomshadowstyletextmutationhtml">trunk/LayoutTests/fast/shadow-dom/shadow-style-text-mutation.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (206403 => 206404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-09-26 23:45:21 UTC (rev 206403)
+++ trunk/LayoutTests/ChangeLog 2016-09-26 23:51:17 UTC (rev 206404)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2016-09-26 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><ins>+ Setter on style element's textContent or cssText doesn't trigger style recalc
+ https://bugs.webkit.org/show_bug.cgi?id=160331
+ <rdar://problem/27609715>
+
+ Reviewed by Ryosuke Niwa and Daniel Bates.
+
+ * fast/shadow-dom/shadow-style-text-mutation-expected.html: Added.
+ * fast/shadow-dom/shadow-style-text-mutation.html: Added.
+
+2016-09-26 Antti Koivisto <antti@apple.com>
+
</ins><span class="cx"> Input elements don't work inside shadow tree
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=160427
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomshadowstyletextmutationexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/shadow-style-text-mutation-expected.html (0 => 206404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/shadow-style-text-mutation-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/shadow-style-text-mutation-expected.html 2016-09-26 23:51:17 UTC (rev 206404)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+ <p>Test passes if you see a single 100px by 100px green box below.</p>
+ <div style="width: 100px; height: 100px; background: green;"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomshadowstyletextmutationhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/shadow-style-text-mutation.html (0 => 206404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/shadow-style-text-mutation.html (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/shadow-style-text-mutation.html 2016-09-26 23:51:17 UTC (rev 206404)
</span><span class="lines">@@ -0,0 +1,63 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+.test {
+ width: 100px;
+ height: 25px;
+ background: red;
+}
+#host4 { background: green };
+</style>
+</head>
+<body>
+<p>Test passes if you see a single 100px by 100px green box below.</p>
+<div id="host1" class="test"></div>
+<div id="host2" class="test"></div>
+<div id="host3" class="test"></div>
+<div id="host4" class="test"></div>
+<script>
+{
+ var host = document.getElementById('host1');
+ var shadow = host.attachShadow({mode: 'closed'});
+ shadow.innerHTML = `
+ <div style="height:100%"></div>
+ `;
+ document.body.offsetWidth;
+ var style = document.createElement("style");
+ style.textContent = "div { background: green; }";
+ shadow.appendChild(style);
+}
+{
+ var host = document.getElementById('host2');
+ var shadow = host.attachShadow({mode: 'closed'});
+ shadow.innerHTML = `
+ <style></style>
+ <div style="height:100%"></div>
+ `;
+ document.body.offsetWidth;
+ shadow.querySelector('style').textContent = "div { background: green; }";
+}
+{
+ var host = document.getElementById('host3');
+ var shadow = host.attachShadow({mode: 'closed'});
+ shadow.innerHTML = `
+ <style>div { background: red; }</style>
+ <div style="height:100%"></div>
+ `;
+ document.body.offsetWidth;
+ shadow.querySelector('style').textContent = "div { background: green; }";
+}
+{
+ var host = document.getElementById('host4');
+ var shadow = host.attachShadow({mode: 'closed'});
+ shadow.innerHTML = `
+ <style>div { background: red; }</style>
+ <div style="height:100%"></div>
+ `;
+ document.body.offsetWidth;
+ shadow.querySelector('style').textContent = "";
+}
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206403 => 206404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-26 23:45:21 UTC (rev 206403)
+++ trunk/Source/WebCore/ChangeLog 2016-09-26 23:51:17 UTC (rev 206404)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2016-09-26 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><ins>+ Setter on style element's textContent or cssText doesn't trigger style recalc
+ https://bugs.webkit.org/show_bug.cgi?id=160331
+ <rdar://problem/27609715>
+
+ Reviewed by Ryosuke Niwa and Daniel Bates.
+
+ We would not notify the parent when text node content changed in a shadow tree.
+
+ Test: fast/shadow-dom/shadow-style-text-mutation.html
+
+ * dom/AuthorStyleSheets.cpp:
+ (WebCore::AuthorStyleSheets::updateActiveStyleSheets):
+
+ Invalidate shadow root children instead of the root itself when doing full invalidation.
+ The invalidity bits have no meaning for non-element, non-texts.
+
+ * dom/CharacterData.cpp:
+ (WebCore::CharacterData::parserAppendData):
+ (WebCore::CharacterData::setDataAndUpdate):
+ (WebCore::CharacterData::notifyParentAfterChange):
+
+ Add a helper and call it also in shadow trees.
+
+ (WebCore::CharacterData::dispatchModifiedEvent):
+ * dom/CharacterData.h:
+
+2016-09-26 Antti Koivisto <antti@apple.com>
+
</ins><span class="cx"> Input elements don't work inside shadow tree
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=160427
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomAuthorStyleSheetscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/AuthorStyleSheets.cpp (206403 => 206404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/AuthorStyleSheets.cpp 2016-09-26 23:45:21 UTC (rev 206403)
+++ trunk/Source/WebCore/dom/AuthorStyleSheets.cpp 2016-09-26 23:51:17 UTC (rev 206404)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "CSSStyleSheet.h"
</span><span class="cx"> #include "Element.h"
</span><ins>+#include "ElementChildIterator.h"
</ins><span class="cx"> #include "ExtensionStyleSheets.h"
</span><span class="cx"> #include "HTMLIFrameElement.h"
</span><span class="cx"> #include "HTMLLinkElement.h"
</span><span class="lines">@@ -336,9 +337,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (requiresFullStyleRecalc) {
</span><del>- if (m_shadowRoot)
- m_shadowRoot->setNeedsStyleRecalc();
- else
</del><ins>+ if (m_shadowRoot) {
+ for (auto& shadowChild : childrenOfType<Element>(*m_shadowRoot))
+ shadowChild.setNeedsStyleRecalc();
+ } else
</ins><span class="cx"> m_document.scheduleForcedStyleRecalc();
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomCharacterDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CharacterData.cpp (206403 => 206404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CharacterData.cpp 2016-09-26 23:45:21 UTC (rev 206403)
+++ trunk/Source/WebCore/dom/CharacterData.cpp 2016-09-26 23:51:17 UTC (rev 206404)
</span><span class="lines">@@ -103,18 +103,7 @@
</span><span class="cx"> if (is<Text>(*this) && parentNode())
</span><span class="cx"> downcast<Text>(*this).updateRendererAfterContentChange(oldLength, 0);
</span><span class="cx">
</span><del>- document().incDOMTreeVersion();
- // We don't call dispatchModifiedEvent here because we don't want the
- // parser to dispatch DOM mutation events.
- if (parentNode()) {
- ContainerNode::ChildChange change = {
- ContainerNode::TextChanged,
- ElementTraversal::previousSibling(*this),
- ElementTraversal::nextSibling(*this),
- ContainerNode::ChildChangeSourceParser
- };
- parentNode()->childrenChanged(change);
- }
</del><ins>+ notifyParentAfterChange(ContainerNode::ChildChangeSourceParser);
</ins><span class="cx">
</span><span class="cx"> return characterLengthLimit;
</span><span class="cx"> }
</span><span class="lines">@@ -208,10 +197,27 @@
</span><span class="cx"> if (document().frame())
</span><span class="cx"> document().frame()->selection().textWasReplaced(this, offsetOfReplacedData, oldLength, newLength);
</span><span class="cx">
</span><del>- document().incDOMTreeVersion();
</del><ins>+ notifyParentAfterChange(ContainerNode::ChildChangeSourceAPI);
+
</ins><span class="cx"> dispatchModifiedEvent(oldData);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void CharacterData::notifyParentAfterChange(ContainerNode::ChildChangeSource source)
+{
+ document().incDOMTreeVersion();
+
+ if (!parentNode())
+ return;
+
+ ContainerNode::ChildChange change = {
+ ContainerNode::TextChanged,
+ ElementTraversal::previousSibling(*this),
+ ElementTraversal::nextSibling(*this),
+ source
+ };
+ parentNode()->childrenChanged(change);
+}
+
</ins><span class="cx"> void CharacterData::dispatchModifiedEvent(const String& oldData)
</span><span class="cx"> {
</span><span class="cx"> if (std::unique_ptr<MutationObserverInterestGroup> mutationRecipients = MutationObserverInterestGroup::createForCharacterDataMutation(*this))
</span><span class="lines">@@ -218,15 +224,6 @@
</span><span class="cx"> mutationRecipients->enqueueMutationRecord(MutationRecord::createCharacterData(*this, oldData));
</span><span class="cx">
</span><span class="cx"> if (!isInShadowTree()) {
</span><del>- if (parentNode()) {
- ContainerNode::ChildChange change = {
- ContainerNode::TextChanged,
- ElementTraversal::previousSibling(*this),
- ElementTraversal::nextSibling(*this),
- ContainerNode::ChildChangeSourceAPI
- };
- parentNode()->childrenChanged(change);
- }
</del><span class="cx"> if (document().hasListenerType(Document::DOMCHARACTERDATAMODIFIED_LISTENER))
</span><span class="cx"> dispatchScopedEvent(MutationEvent::create(eventNames().DOMCharacterDataModifiedEvent, true, nullptr, oldData, m_data));
</span><span class="cx"> dispatchSubtreeModifiedEvent();
</span></span></pre></div>
<a id="trunkSourceWebCoredomCharacterDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CharacterData.h (206403 => 206404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CharacterData.h 2016-09-26 23:45:21 UTC (rev 206403)
+++ trunk/Source/WebCore/dom/CharacterData.h 2016-09-26 23:51:17 UTC (rev 206404)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><del>-#include "Node.h"
</del><ins>+#include "ContainerNode.h"
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -69,6 +69,7 @@
</span><span class="cx"> bool offsetInCharacters() const final;
</span><span class="cx"> void setDataAndUpdate(const String&, unsigned offsetOfReplacedData, unsigned oldLength, unsigned newLength);
</span><span class="cx"> void checkCharDataOperation(unsigned offset, ExceptionCode&);
</span><ins>+ void notifyParentAfterChange(ContainerNode::ChildChangeSource);
</ins><span class="cx">
</span><span class="cx"> String m_data;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>