<!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>[165201] branches/safari-537.75-branch</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/165201">165201</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-03-06 11:51:57 -0800 (Thu, 06 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/153788">r153788</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53775branchLayoutTestsChangeLog">branches/safari-537.75-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari53775branchLayoutTestsinspectortimelinetimelinescripttag1expectedtxt">branches/safari-537.75-branch/LayoutTests/inspector/timeline/timeline-script-tag-1-expected.txt</a></li>
<li><a href="#branchessafari53775branchSourceWebCoreChangeLog">branches/safari-537.75-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53775branchSourceWebCoredomDocumentStyleSheetCollectioncpp">branches/safari-537.75-branch/Source/WebCore/dom/DocumentStyleSheetCollection.cpp</a></li>
<li><a href="#branchessafari53775branchSourceWebCorepagePageGroupcpp">branches/safari-537.75-branch/Source/WebCore/page/PageGroup.cpp</a></li>
<li><a href="#branchessafari53775branchSourceWebCorepagePageGrouph">branches/safari-537.75-branch/Source/WebCore/page/PageGroup.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53775branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/LayoutTests/ChangeLog (165200 => 165201)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/LayoutTests/ChangeLog 2014-03-06 19:40:06 UTC (rev 165200)
+++ branches/safari-537.75-branch/LayoutTests/ChangeLog 2014-03-06 19:51:57 UTC (rev 165201)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-03-06 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r153788.
+
+ 2013-08-07 Antti Koivisto <antti@apple.com>
+
+ 2.5% regression on page cycler moz
+ https://bugs.webkit.org/show_bug.cgi?id=102822
+
+ Reviewed by Andreas Kling.
+
+ This is a progression.
+
+ * inspector/timeline/timeline-script-tag-1-expected.txt:
+
</ins><span class="cx"> 2014-03-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r158724.
</span></span></pre></div>
<a id="branchessafari53775branchLayoutTestsinspectortimelinetimelinescripttag1expectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/LayoutTests/inspector/timeline/timeline-script-tag-1-expected.txt (165200 => 165201)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/LayoutTests/inspector/timeline/timeline-script-tag-1-expected.txt 2014-03-06 19:40:06 UTC (rev 165200)
+++ branches/safari-537.75-branch/LayoutTests/inspector/timeline/timeline-script-tag-1-expected.txt 2014-03-06 19:51:57 UTC (rev 165201)
</span><span class="lines">@@ -3,10 +3,8 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> ParseHTML
</span><del>-----> ScheduleStyleRecalculation
</del><span class="cx"> ----> InvalidateLayout
</span><span class="cx"> ParseHTML
</span><del>-----> ScheduleStyleRecalculation
</del><span class="cx"> ----> EvaluateScript
</span><span class="cx"> --------> TimeStamp : SCRIPT TAG
</span><span class="cx"> ----> InvalidateLayout
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/ChangeLog (165200 => 165201)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-03-06 19:40:06 UTC (rev 165200)
+++ branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-03-06 19:51:57 UTC (rev 165201)
</span><span class="lines">@@ -1,5 +1,41 @@
</span><span class="cx"> 2014-03-06 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r153788.
+
+ 2013-08-07 Antti Koivisto <antti@apple.com>
+
+ 2.5% regression on page cycler moz
+ https://bugs.webkit.org/show_bug.cgi?id=102822
+
+ Reviewed by Andreas Kling.
+
+ DocumentStyleSheetCollection::invalidateInjectedStyleSheetCache() triggers a style recalc for quirks mode
+ documents in the beginning of document parsing via Document::setCompatibilityMode. This often coalesces
+ with style recalc triggered by stylesheet loading. However on very simple documents it can generate genuinely
+ unnecessary work.
+
+ * dom/DocumentStyleSheetCollection.cpp:
+ (WebCore::DocumentStyleSheetCollection::invalidateInjectedStyleSheetCache):
+
+ Check that we actually have cached injected stylesheets before triggering style recalc.
+
+ * page/PageGroup.cpp:
+ (WebCore::PageGroup::addUserStyleSheetToWorld):
+ (WebCore::PageGroup::removeUserStyleSheetFromWorld):
+ (WebCore::PageGroup::removeUserStyleSheetsFromWorld):
+ (WebCore::PageGroup::removeAllUserContent):
+
+ Fix a misspelling.
+
+ (WebCore::PageGroup::invalidateInjectedStyleSheetCacheInAllFrames):
+
+ Always invalidate style when user sheets change since we don't do that in
+ DocumentStyleSheetCollection::invalidateInjectedStyleSheetCache anymore.
+
+ * page/PageGroup.h:
+
+2014-03-06 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r155071.
</span><span class="cx">
</span><span class="cx"> 2013-09-04 Pratik Solanki <psolanki@apple.com>
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCoredomDocumentStyleSheetCollectioncpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/dom/DocumentStyleSheetCollection.cpp (165200 => 165201)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/dom/DocumentStyleSheetCollection.cpp 2014-03-06 19:40:06 UTC (rev 165200)
+++ branches/safari-537.75-branch/Source/WebCore/dom/DocumentStyleSheetCollection.cpp 2014-03-06 19:51:57 UTC (rev 165201)
</span><span class="lines">@@ -187,7 +187,11 @@
</span><span class="cx">
</span><span class="cx"> void DocumentStyleSheetCollection::invalidateInjectedStyleSheetCache()
</span><span class="cx"> {
</span><ins>+ if (!m_injectedStyleSheetCacheValid)
+ return;
</ins><span class="cx"> m_injectedStyleSheetCacheValid = false;
</span><ins>+ if (m_injectedUserStyleSheets.isEmpty() && m_injectedAuthorStyleSheets.isEmpty())
+ return;
</ins><span class="cx"> m_document->styleResolverChanged(DeferRecalcStyle);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCorepagePageGroupcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/page/PageGroup.cpp (165200 => 165201)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/page/PageGroup.cpp 2014-03-06 19:40:06 UTC (rev 165200)
+++ branches/safari-537.75-branch/Source/WebCore/page/PageGroup.cpp 2014-03-06 19:51:57 UTC (rev 165201)
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx"> styleSheetsInWorld->append(userStyleSheet.release());
</span><span class="cx">
</span><span class="cx"> if (injectionTime == InjectInExistingDocuments)
</span><del>- invalidatedInjectedStyleSheetCacheInAllFrames();
</del><ins>+ invalidateInjectedStyleSheetCacheInAllFrames();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageGroup::removeUserScriptFromWorld(DOMWrapperWorld* world, const KURL& url)
</span><span class="lines">@@ -355,7 +355,7 @@
</span><span class="cx"> if (stylesheets->isEmpty())
</span><span class="cx"> m_userStyleSheets->remove(it);
</span><span class="cx">
</span><del>- invalidatedInjectedStyleSheetCacheInAllFrames();
</del><ins>+ invalidateInjectedStyleSheetCacheInAllFrames();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageGroup::removeUserScriptsFromWorld(DOMWrapperWorld* world)
</span><span class="lines">@@ -385,7 +385,7 @@
</span><span class="cx">
</span><span class="cx"> m_userStyleSheets->remove(it);
</span><span class="cx">
</span><del>- invalidatedInjectedStyleSheetCacheInAllFrames();
</del><ins>+ invalidateInjectedStyleSheetCacheInAllFrames();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageGroup::removeAllUserContent()
</span><span class="lines">@@ -394,17 +394,19 @@
</span><span class="cx">
</span><span class="cx"> if (m_userStyleSheets) {
</span><span class="cx"> m_userStyleSheets.clear();
</span><del>- invalidatedInjectedStyleSheetCacheInAllFrames();
</del><ins>+ invalidateInjectedStyleSheetCacheInAllFrames();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PageGroup::invalidatedInjectedStyleSheetCacheInAllFrames()
</del><ins>+void PageGroup::invalidateInjectedStyleSheetCacheInAllFrames()
</ins><span class="cx"> {
</span><span class="cx"> // Clear our cached sheets and have them just reparse.
</span><span class="cx"> HashSet<Page*>::const_iterator end = m_pages.end();
</span><span class="cx"> for (HashSet<Page*>::const_iterator it = m_pages.begin(); it != end; ++it) {
</span><del>- for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree()->traverseNext())
</del><ins>+ for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
</ins><span class="cx"> frame->document()->styleSheetCollection()->invalidateInjectedStyleSheetCache();
</span><ins>+ frame->document()->styleResolverChanged(DeferRecalcStyle);
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCorepagePageGrouph"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/page/PageGroup.h (165200 => 165201)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/page/PageGroup.h 2014-03-06 19:40:06 UTC (rev 165200)
+++ branches/safari-537.75-branch/Source/WebCore/page/PageGroup.h 2014-03-06 19:51:57 UTC (rev 165201)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> PageGroup(Page*);
</span><span class="cx">
</span><span class="cx"> void addVisitedLink(LinkHash);
</span><del>- void invalidatedInjectedStyleSheetCacheInAllFrames();
</del><ins>+ void invalidateInjectedStyleSheetCacheInAllFrames();
</ins><span class="cx">
</span><span class="cx"> String m_name;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>