<!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>[214869] releases/WebKitGTK/webkit-2.16</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/214869">214869</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-04-04 00:27:21 -0700 (Tue, 04 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/214830">r214830</a> - REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/207669">r207669</a>): FileMaker Pro Help pages do not render correctly
https://bugs.webkit.org/show_bug.cgi?id=170402
<rdar://problem/31004344>
Reviewed by Simon Fraser.
Source/WebCore:
If a new stylesheet load is started from the load event the document.styleSheets does not
always reflect the already loaded stylesheets.
Test: fast/css/document-stylesheets-dynamic.html
* style/StyleScope.cpp:
(WebCore::Style::Scope::updateActiveStyleSheets):
Remove an old optimization where we would not update active stylesheets if there were pending
(head) stylesheet loads and they had not been updated already.
This is probably not a valuable optimization anymore with the new lazy stylesheet update strategy.
* style/StyleScope.h:
LayoutTests:
* fast/css/document-stylesheets-dynamic-expected.html: Added.
* fast/css/document-stylesheets-dynamic.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCorestyleStyleScopecpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/style/StyleScope.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCorestyleStyleScopeh">releases/WebKitGTK/webkit-2.16/Source/WebCore/style/StyleScope.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsfastcssdocumentstylesheetsdynamicexpectedhtml">releases/WebKitGTK/webkit-2.16/LayoutTests/fast/css/document-stylesheets-dynamic-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsfastcssdocumentstylesheetsdynamichtml">releases/WebKitGTK/webkit-2.16/LayoutTests/fast/css/document-stylesheets-dynamic.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit216LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog (214868 => 214869)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog 2017-04-04 07:20:14 UTC (rev 214868)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog 2017-04-04 07:27:21 UTC (rev 214869)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-04-03 Antti Koivisto <antti@apple.com>
+
+ REGRESSION (r207669): FileMaker Pro Help pages do not render correctly
+ https://bugs.webkit.org/show_bug.cgi?id=170402
+ <rdar://problem/31004344>
+
+ Reviewed by Simon Fraser.
+
+ * fast/css/document-stylesheets-dynamic-expected.html: Added.
+ * fast/css/document-stylesheets-dynamic.html: Added.
+
</ins><span class="cx"> 2017-04-03 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [SOUP] URI Fragment is lost after redirect
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestsfastcssdocumentstylesheetsdynamicexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.16/LayoutTests/fast/css/document-stylesheets-dynamic-expected.html (0 => 214869)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/fast/css/document-stylesheets-dynamic-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/fast/css/document-stylesheets-dynamic-expected.html 2017-04-04 07:27:21 UTC (rev 214869)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestsfastcssdocumentstylesheetsdynamichtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.16/LayoutTests/fast/css/document-stylesheets-dynamic.html (0 => 214869)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/fast/css/document-stylesheets-dynamic.html (rev 0)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/fast/css/document-stylesheets-dynamic.html 2017-04-04 07:27:21 UTC (rev 214869)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<head>
+<script>
+function test()
+{
+ const link = document.createElement("link");
+ link.setAttribute("rel", "stylesheet");
+ link.setAttribute("href", "data:text/css,body { background:white !important; }");
+ document.head.appendChild(link);
+ const count = document.styleSheets.length;
+ document.body.innerHTML = (count == 1) ? `PASS` : `FAIL: document.styleSheets.length == ${count}`
+}
+</script>
+<link rel=stylesheet href="data:text/css,body { color:black !important; }">
+</head>
+<body onload="test()" style="color:blue; background:red">
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (214868 => 214869)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-04-04 07:20:14 UTC (rev 214868)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-04-04 07:27:21 UTC (rev 214869)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2017-04-03 Antti Koivisto <antti@apple.com>
+
+ REGRESSION (r207669): FileMaker Pro Help pages do not render correctly
+ https://bugs.webkit.org/show_bug.cgi?id=170402
+ <rdar://problem/31004344>
+
+ Reviewed by Simon Fraser.
+
+ If a new stylesheet load is started from the load event the document.styleSheets does not
+ always reflect the already loaded stylesheets.
+
+ Test: fast/css/document-stylesheets-dynamic.html
+
+ * style/StyleScope.cpp:
+ (WebCore::Style::Scope::updateActiveStyleSheets):
+
+ Remove an old optimization where we would not update active stylesheets if there were pending
+ (head) stylesheet loads and they had not been updated already.
+ This is probably not a valuable optimization anymore with the new lazy stylesheet update strategy.
+
+ * style/StyleScope.h:
+
</ins><span class="cx"> 2017-04-01 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Long Arabic text in ContentEditable with css white-space=pre hangs Safari
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCorestyleStyleScopecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/style/StyleScope.cpp (214868 => 214869)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/style/StyleScope.cpp 2017-04-04 07:20:14 UTC (rev 214868)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/style/StyleScope.cpp 2017-04-04 07:27:21 UTC (rev 214869)
</span><span class="lines">@@ -392,15 +392,6 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Don't bother updating, since we haven't loaded all our style info yet
- // and haven't calculated the style resolver for the first time.
- if (!m_shadowRoot && !m_didUpdateActiveStyleSheets && m_pendingStyleSheetCount) {
- clearResolver();
- return;
- }
-
- m_didUpdateActiveStyleSheets = true;
-
</del><span class="cx"> Vector<RefPtr<StyleSheet>> activeStyleSheets;
</span><span class="cx"> collectActiveStyleSheets(activeStyleSheets);
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCorestyleStyleScopeh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/style/StyleScope.h (214868 => 214869)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/style/StyleScope.h 2017-04-04 07:20:14 UTC (rev 214868)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/style/StyleScope.h 2017-04-04 07:27:21 UTC (rev 214869)
</span><span class="lines">@@ -150,7 +150,6 @@
</span><span class="cx"> // We use this count of pending sheets to detect when we can begin attaching
</span><span class="cx"> // elements and when it is safe to execute scripts.
</span><span class="cx"> int m_pendingStyleSheetCount { 0 };
</span><del>- bool m_didUpdateActiveStyleSheets { false };
</del><span class="cx">
</span><span class="cx"> std::optional<UpdateType> m_pendingUpdate;
</span><span class="cx"> bool m_hasDescendantWithPendingUpdate { false };
</span></span></pre>
</div>
</div>
</body>
</html>