<!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>[208967] 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/208967">208967</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-11-22 12:13:38 -0800 (Tue, 22 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>CrashTracer: [USER] com.apple.WebKit.WebContent at com.apple.WebCore: WebCore::ExtensionStyleSheets::pageUserSheet + 14
https://bugs.webkit.org/show_bug.cgi?id=165030
Reviewed by Darin Adler.
Source/WebCore:
We failed to reset the style scope when an element was moved to a different document. This could lead to having dangling
document pointers in style scope and style resolver.
Test: fast/shadow-dom/shadow-host-move-to-different-document.html
* dom/ShadowRoot.cpp:
(WebCore::ShadowRoot::didMoveToNewDocument):
Reset style scope.
* dom/ShadowRoot.h:
* style/StyleScope.cpp:
(WebCore::Style::Scope::resolver):
Some more assertions.
* style/StyleScope.h:
(WebCore::Style::Scope::document):
LayoutTests:
* fast/shadow-dom/shadow-host-move-to-different-document-expected.html: Added.
* fast/shadow-dom/shadow-host-move-to-different-document.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="#trunkSourceWebCoredomShadowRootcpp">trunk/Source/WebCore/dom/ShadowRoot.cpp</a></li>
<li><a href="#trunkSourceWebCoredomShadowRooth">trunk/Source/WebCore/dom/ShadowRoot.h</a></li>
<li><a href="#trunkSourceWebCorestyleStyleScopecpp">trunk/Source/WebCore/style/StyleScope.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleScopeh">trunk/Source/WebCore/style/StyleScope.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastshadowdomshadowhostmovetodifferentdocumentexpectedhtml">trunk/LayoutTests/fast/shadow-dom/shadow-host-move-to-different-document-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshadowdomshadowhostmovetodifferentdocumenthtml">trunk/LayoutTests/fast/shadow-dom/shadow-host-move-to-different-document.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (208966 => 208967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-11-22 19:16:55 UTC (rev 208966)
+++ trunk/LayoutTests/ChangeLog 2016-11-22 20:13:38 UTC (rev 208967)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-11-22 Antti Koivisto <antti@apple.com>
+
+ CrashTracer: [USER] com.apple.WebKit.WebContent at com.apple.WebCore: WebCore::ExtensionStyleSheets::pageUserSheet + 14
+ https://bugs.webkit.org/show_bug.cgi?id=165030
+
+ Reviewed by Darin Adler.
+
+ * fast/shadow-dom/shadow-host-move-to-different-document-expected.html: Added.
+ * fast/shadow-dom/shadow-host-move-to-different-document.html: Added.
+
</ins><span class="cx"> 2016-11-20 Megan Gardner <megan_gardner@apple.com>
</span><span class="cx">
</span><span class="cx"> Add iOS text selection tests - long press clear and multi line selection tests
</span></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomshadowhostmovetodifferentdocumentexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/shadow-host-move-to-different-document-expected.html (0 => 208967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/shadow-host-move-to-different-document-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/shadow-host-move-to-different-document-expected.html 2016-11-22 20:13:38 UTC (rev 208967)
</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="trunkLayoutTestsfastshadowdomshadowhostmovetodifferentdocumenthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/shadow-host-move-to-different-document.html (0 => 208967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/shadow-host-move-to-different-document.html (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/shadow-host-move-to-different-document.html 2016-11-22 20:13:38 UTC (rev 208967)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<!DOCTYPE html>
+<style>
+div { color: green; }
+</style>
+<p>Test passes if you see a single 100px by 100px green box below.</p>
+<iframe></iframe>
+<script>
+const frameDocument = document.querySelector('iframe').contentDocument;
+frameDocument.body.innerHTML = `<div></div>`;
+const host = frameDocument.querySelector('div');
+host.attachShadow({mode:'closed'}).innerHTML = `
+ <style>
+ :host {
+ color: red;
+ background: green;
+ width: 100px;
+ height: 100px;
+ }
+ </style>
+ <span>Test moving a host to a different document.</span>
+`;
+host.offsetWidth;
+document.adoptNode(host);
+document.body.appendChild(host);
+document.body.removeChild(document.querySelector('iframe'));
+if (window.GCController)
+ GCController.collect();
+</script>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208966 => 208967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-22 19:16:55 UTC (rev 208966)
+++ trunk/Source/WebCore/ChangeLog 2016-11-22 20:13:38 UTC (rev 208967)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-11-22 Antti Koivisto <antti@apple.com>
+
+ CrashTracer: [USER] com.apple.WebKit.WebContent at com.apple.WebCore: WebCore::ExtensionStyleSheets::pageUserSheet + 14
+ https://bugs.webkit.org/show_bug.cgi?id=165030
+
+ Reviewed by Darin Adler.
+
+ We failed to reset the style scope when an element was moved to a different document. This could lead to having dangling
+ document pointers in style scope and style resolver.
+
+ Test: fast/shadow-dom/shadow-host-move-to-different-document.html
+
+ * dom/ShadowRoot.cpp:
+ (WebCore::ShadowRoot::didMoveToNewDocument):
+
+ Reset style scope.
+
+ * dom/ShadowRoot.h:
+ * style/StyleScope.cpp:
+ (WebCore::Style::Scope::resolver):
+
+ Some more assertions.
+
+ * style/StyleScope.h:
+ (WebCore::Style::Scope::document):
+
</ins><span class="cx"> 2016-11-22 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Make normal case fast in the input element limitString function
</span></span></pre></div>
<a id="trunkSourceWebCoredomShadowRootcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ShadowRoot.cpp (208966 => 208967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ShadowRoot.cpp 2016-11-22 19:16:55 UTC (rev 208966)
+++ trunk/Source/WebCore/dom/ShadowRoot.cpp 2016-11-22 20:13:38 UTC (rev 208967)
</span><span class="lines">@@ -102,6 +102,17 @@
</span><span class="cx"> document().didRemoveInDocumentShadowRoot(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ShadowRoot::didMoveToNewDocument(Document& oldDocument)
+{
+ ASSERT(&document() != &oldDocument);
+ ASSERT(&m_styleScope->document() == &oldDocument);
+
+ // Style scopes are document specific.
+ m_styleScope = std::make_unique<Style::Scope>(*this);
+
+ DocumentFragment::didMoveToNewDocument(oldDocument);
+}
+
</ins><span class="cx"> Style::Scope& ShadowRoot::styleScope()
</span><span class="cx"> {
</span><span class="cx"> return *m_styleScope;
</span></span></pre></div>
<a id="trunkSourceWebCoredomShadowRooth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ShadowRoot.h (208966 => 208967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ShadowRoot.h 2016-11-22 19:16:55 UTC (rev 208966)
+++ trunk/Source/WebCore/dom/ShadowRoot.h 2016-11-22 20:13:38 UTC (rev 208967)
</span><span class="lines">@@ -96,6 +96,7 @@
</span><span class="cx">
</span><span class="cx"> Node::InsertionNotificationRequest insertedInto(ContainerNode& insertionPoint) override;
</span><span class="cx"> void removedFrom(ContainerNode& insertionPoint) override;
</span><ins>+ void didMoveToNewDocument(Document& oldDocument) override;
</ins><span class="cx">
</span><span class="cx"> bool m_resetStyleInheritance { false };
</span><span class="cx"> ShadowRootMode m_type { ShadowRootMode::UserAgent };
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleScope.cpp (208966 => 208967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleScope.cpp 2016-11-22 19:16:55 UTC (rev 208966)
+++ trunk/Source/WebCore/style/StyleScope.cpp 2016-11-22 20:13:38 UTC (rev 208967)
</span><span class="lines">@@ -96,6 +96,8 @@
</span><span class="cx"> m_resolver = std::make_unique<StyleResolver>(m_document);
</span><span class="cx"> m_resolver->appendAuthorStyleSheets(m_activeStyleSheets);
</span><span class="cx"> }
</span><ins>+ ASSERT(!m_shadowRoot || &m_document == &m_shadowRoot->document());
+ ASSERT(&m_resolver->document() == &m_document);
</ins><span class="cx"> return *m_resolver;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleScope.h (208966 => 208967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleScope.h 2016-11-22 19:16:55 UTC (rev 208966)
+++ trunk/Source/WebCore/style/StyleScope.h 2016-11-22 20:13:38 UTC (rev 208967)
</span><span class="lines">@@ -99,6 +99,8 @@
</span><span class="cx"> StyleResolver* resolverIfExists();
</span><span class="cx"> void clearResolver();
</span><span class="cx">
</span><ins>+ const Document& document() const { return m_document; }
+
</ins><span class="cx"> static Scope& forNode(Node&);
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre>
</div>
</div>
</body>
</html>