<!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>[208200] 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/208200">208200</a></dd>
<dt>Author</dt> <dd>ryanhaddad@apple.com</dd>
<dt>Date</dt> <dd>2016-10-31 17:27:28 -0700 (Mon, 31 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/207967">r207967</a>.
This change seems to be the cause of at least one LayoutTest
becoming flaky.
Reverted changeset:
"REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/207753">r207753</a>-207755): ASSERTION FAILED:
m_parsedStyleSheetCache->isInMemoryCache()"
https://bugs.webkit.org/show_bug.cgi?id=163905
http://trac.webkit.org/changeset/207967</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="#trunkSourceWebCorecssStyleSheetContentscpp">trunk/Source/WebCore/css/StyleSheetContents.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleSheetContentsh">trunk/Source/WebCore/css/StyleSheetContents.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedCSSStyleSheetcpp">trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestssecuritycachedcrossoriginsharedcssstylesheetexpectedtxt">trunk/LayoutTests/http/tests/security/cached-cross-origin-shared-css-stylesheet-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycachedcrossoriginsharedcssstylesheethtml">trunk/LayoutTests/http/tests/security/cached-cross-origin-shared-css-stylesheet.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (208199 => 208200)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-11-01 00:23:29 UTC (rev 208199)
+++ trunk/LayoutTests/ChangeLog 2016-11-01 00:27:28 UTC (rev 208200)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-31 Ryan Haddad <ryanhaddad@apple.com>
+
+ Unreviewed, rolling out r207967.
+
+ This change seems to be the cause of at least one LayoutTest
+ becoming flaky.
+
+ Reverted changeset:
+
+ "REGRESSION(r207753-207755): ASSERTION FAILED:
+ m_parsedStyleSheetCache->isInMemoryCache()"
+ https://bugs.webkit.org/show_bug.cgi?id=163905
+ http://trac.webkit.org/changeset/207967
+
</ins><span class="cx"> 2016-10-31 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Shadow DOM scoped styles are missing
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycachedcrossoriginsharedcssstylesheetexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/security/cached-cross-origin-shared-css-stylesheet-expected.txt (208199 => 208200)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cached-cross-origin-shared-css-stylesheet-expected.txt 2016-11-01 00:23:29 UTC (rev 208199)
+++ trunk/LayoutTests/http/tests/security/cached-cross-origin-shared-css-stylesheet-expected.txt 2016-11-01 00:27:28 UTC (rev 208200)
</span><span class="lines">@@ -1,2 +0,0 @@
</span><del>-Test is passing if not crashing
-PASS
</del></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycachedcrossoriginsharedcssstylesheethtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/security/cached-cross-origin-shared-css-stylesheet.html (208199 => 208200)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cached-cross-origin-shared-css-stylesheet.html 2016-11-01 00:23:29 UTC (rev 208199)
+++ trunk/LayoutTests/http/tests/security/cached-cross-origin-shared-css-stylesheet.html 2016-11-01 00:27:28 UTC (rev 208200)
</span><span class="lines">@@ -1,34 +0,0 @@
</span><del>-<!DOCTYPE html>
-<div>Test is passing if not crashing</div>
-<div id ="log"></div>
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-
-function createLinkElement(isCORS, handler)
-{
- link = document.createElement('link');
- link.href = "http://127.0.0.1:8080/security/resources/allow-if-origin.php?allowCache&origin=http%3A%2F%2F127.0.0.1%3A8000&name=cssStyle.css&contentType=text/css&allowCredentials"
- link.rel = "stylesheet";
- link.type = "text/css";
- if (isCORS)
- link.crossOrigin = "use-credentials";
- link.onload = handler;
- link.onerror = () => { console.log("Unexpected error loading link"); }
- return link;
-}
-
-document.body.appendChild(createLinkElement(false, function() {
- setTimeout(function() {
- document.body.appendChild(createLinkElement(true, function() {
- if (window.internals)
- internals.beginSimulatedMemoryPressure();
- document.getElementById('log').innerHTML = "PASS";
- if (window.testRunner)
- testRunner.notifyDone();
- }));
- }, 1000);
-}));
-</script>
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208199 => 208200)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-01 00:23:29 UTC (rev 208199)
+++ trunk/Source/WebCore/ChangeLog 2016-11-01 00:27:28 UTC (rev 208200)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-31 Ryan Haddad <ryanhaddad@apple.com>
+
+ Unreviewed, rolling out r207967.
+
+ This change seems to be the cause of at least one LayoutTest
+ becoming flaky.
+
+ Reverted changeset:
+
+ "REGRESSION(r207753-207755): ASSERTION FAILED:
+ m_parsedStyleSheetCache->isInMemoryCache()"
+ https://bugs.webkit.org/show_bug.cgi?id=163905
+ http://trac.webkit.org/changeset/207967
+
</ins><span class="cx"> 2016-10-31 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Shadow DOM scoped styles are missing
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleSheetContentscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleSheetContents.cpp (208199 => 208200)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleSheetContents.cpp 2016-11-01 00:23:29 UTC (rev 208199)
+++ trunk/Source/WebCore/css/StyleSheetContents.cpp 2016-11-01 00:27:28 UTC (rev 208200)
</span><span class="lines">@@ -63,7 +63,13 @@
</span><span class="cx"> : m_ownerRule(ownerRule)
</span><span class="cx"> , m_originalURL(originalURL)
</span><span class="cx"> , m_defaultNamespace(starAtom)
</span><ins>+ , m_loadCompleted(false)
</ins><span class="cx"> , m_isUserStyleSheet(ownerRule && ownerRule->parentStyleSheet() && ownerRule->parentStyleSheet()->isUserStyleSheet())
</span><ins>+ , m_hasSyntacticallyValidCSSHeader(true)
+ , m_didLoadErrorOccur(false)
+ , m_usesStyleBasedEditability(false)
+ , m_isMutable(false)
+ , m_isInMemoryCache(false)
</ins><span class="cx"> , m_parserContext(context)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -78,10 +84,13 @@
</span><span class="cx"> , m_childRules(o.m_childRules.size())
</span><span class="cx"> , m_namespaces(o.m_namespaces)
</span><span class="cx"> , m_defaultNamespace(o.m_defaultNamespace)
</span><ins>+ , m_loadCompleted(true)
</ins><span class="cx"> , m_isUserStyleSheet(o.m_isUserStyleSheet)
</span><del>- , m_loadCompleted(true)
</del><span class="cx"> , m_hasSyntacticallyValidCSSHeader(o.m_hasSyntacticallyValidCSSHeader)
</span><ins>+ , m_didLoadErrorOccur(false)
</ins><span class="cx"> , m_usesStyleBasedEditability(o.m_usesStyleBasedEditability)
</span><ins>+ , m_isMutable(false)
+ , m_isInMemoryCache(false)
</ins><span class="cx"> , m_parserContext(o.m_parserContext)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(o.isCacheable());
</span><span class="lines">@@ -523,15 +532,16 @@
</span><span class="cx">
</span><span class="cx"> void StyleSheetContents::addedToMemoryCache()
</span><span class="cx"> {
</span><ins>+ ASSERT(!m_isInMemoryCache);
</ins><span class="cx"> ASSERT(isCacheable());
</span><del>- ++m_inMemoryCacheCount;
</del><ins>+ m_isInMemoryCache = true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StyleSheetContents::removedFromMemoryCache()
</span><span class="cx"> {
</span><del>- ASSERT(m_inMemoryCacheCount);
</del><ins>+ ASSERT(m_isInMemoryCache);
</ins><span class="cx"> ASSERT(isCacheable());
</span><del>- --m_inMemoryCacheCount;
</del><ins>+ m_isInMemoryCache = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StyleSheetContents::shrinkToFit()
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleSheetContentsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleSheetContents.h (208199 => 208200)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleSheetContents.h 2016-11-01 00:23:29 UTC (rev 208199)
+++ trunk/Source/WebCore/css/StyleSheetContents.h 2016-11-01 00:27:28 UTC (rev 208200)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> bool isMutable() const { return m_isMutable; }
</span><span class="cx"> void setMutable() { m_isMutable = true; }
</span><span class="cx">
</span><del>- bool isInMemoryCache() const { return m_inMemoryCacheCount; }
</del><ins>+ bool isInMemoryCache() const { return m_isInMemoryCache; }
</ins><span class="cx"> void addedToMemoryCache();
</span><span class="cx"> void removedFromMemoryCache();
</span><span class="cx">
</span><span class="lines">@@ -162,14 +162,14 @@
</span><span class="cx"> PrefixNamespaceURIMap m_namespaces;
</span><span class="cx"> AtomicString m_defaultNamespace;
</span><span class="cx">
</span><del>- bool m_isUserStyleSheet;
- bool m_loadCompleted { false };
- bool m_hasSyntacticallyValidCSSHeader { true };
- bool m_didLoadErrorOccur { false };
- bool m_usesStyleBasedEditability { false };
- bool m_isMutable { false };
- unsigned m_inMemoryCacheCount { 0 };
-
</del><ins>+ bool m_loadCompleted : 1;
+ bool m_isUserStyleSheet : 1;
+ bool m_hasSyntacticallyValidCSSHeader : 1;
+ bool m_didLoadErrorOccur : 1;
+ bool m_usesStyleBasedEditability : 1;
+ bool m_isMutable : 1;
+ bool m_isInMemoryCache : 1;
+
</ins><span class="cx"> CSSParserContext m_parserContext;
</span><span class="cx">
</span><span class="cx"> Vector<CSSStyleSheet*> m_clients;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedCSSStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp (208199 => 208200)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp 2016-11-01 00:23:29 UTC (rev 208199)
+++ trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp 2016-11-01 00:27:28 UTC (rev 208200)
</span><span class="lines">@@ -96,8 +96,7 @@
</span><span class="cx">
</span><span class="cx"> m_decoder = sheet.m_decoder;
</span><span class="cx"> m_decodedSheetText = sheet.m_decodedSheetText;
</span><del>- if (sheet.m_parsedStyleSheetCache)
- saveParsedStyleSheet(*sheet.m_parsedStyleSheetCache);
</del><ins>+ m_parsedStyleSheetCache = sheet.m_parsedStyleSheetCache;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CachedCSSStyleSheet::finishLoading(SharedBuffer* data)
</span></span></pre>
</div>
</div>
</body>
</html>