<!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>[197839] releases/WebKitGTK/webkit-2.12/Source/WebCore</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/197839">197839</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-08 23:42:04 -0800 (Tue, 08 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/197552">r197552</a> - Drop DocumentSharedObjectPool immediately when going into PageCache.
<https://webkit.org/b/154986>
Reviewed by Antti Koivisto.
The DocumentSharedObjectPool is a weirdly efficient little optimization
that deduplicates ElementData during the first 10s of a Document's lifetime.
While it's up, every ElementData created will persist so it can be used for
deduplication.
If a Document goes into the PageCache while its shared object pool is still
alive, we can just kill it right away. This will sometimes allow us to free
a bunch of ElementData sooner.
* dom/Document.cpp:
(WebCore::Document::Document):
(WebCore::Document::setInPageCache):
(WebCore::Document::clearSharedObjectPool):
(WebCore::Document::sharedObjectPoolClearTimerFired): Deleted.
* dom/Document.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoredomDocumentcpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoredomDocumenth">releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/Document.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (197838 => 197839)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-03-09 07:29:43 UTC (rev 197838)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-03-09 07:42:04 UTC (rev 197839)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-03-04 Andreas Kling <akling@apple.com>
+
+ Drop DocumentSharedObjectPool immediately when going into PageCache.
+ <https://webkit.org/b/154986>
+
+ Reviewed by Antti Koivisto.
+
+ The DocumentSharedObjectPool is a weirdly efficient little optimization
+ that deduplicates ElementData during the first 10s of a Document's lifetime.
+ While it's up, every ElementData created will persist so it can be used for
+ deduplication.
+
+ If a Document goes into the PageCache while its shared object pool is still
+ alive, we can just kill it right away. This will sometimes allow us to free
+ a bunch of ElementData sooner.
+
+ * dom/Document.cpp:
+ (WebCore::Document::Document):
+ (WebCore::Document::setInPageCache):
+ (WebCore::Document::clearSharedObjectPool):
+ (WebCore::Document::sharedObjectPoolClearTimerFired): Deleted.
+ * dom/Document.h:
+
</ins><span class="cx"> 2016-03-03 Miguel Gomez <magomez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [TextureMapper] Use RGBA format for textures attached to framebuffers
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/Document.cpp (197838 => 197839)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/Document.cpp 2016-03-09 07:29:43 UTC (rev 197838)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/Document.cpp 2016-03-09 07:42:04 UTC (rev 197839)
</span><span class="lines">@@ -532,7 +532,7 @@
</span><span class="cx"> , m_scheduledTasksAreSuspended(false)
</span><span class="cx"> , m_visualUpdatesAllowed(true)
</span><span class="cx"> , m_visualUpdatesSuppressionTimer(*this, &Document::visualUpdatesSuppressionTimerFired)
</span><del>- , m_sharedObjectPoolClearTimer(*this, &Document::sharedObjectPoolClearTimerFired)
</del><ins>+ , m_sharedObjectPoolClearTimer(*this, &Document::clearSharedObjectPool)
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> , m_didDispatchViewportPropertiesChanged(false)
</span><span class="cx"> #endif
</span><span class="lines">@@ -4591,6 +4591,7 @@
</span><span class="cx">
</span><span class="cx"> clearStyleResolver();
</span><span class="cx"> clearSelectorQueryCache();
</span><ins>+ clearSharedObjectPool();
</ins><span class="cx"> } else {
</span><span class="cx"> if (childNeedsStyleRecalc())
</span><span class="cx"> scheduleStyleRecalc();
</span><span class="lines">@@ -5037,9 +5038,10 @@
</span><span class="cx"> m_cachedResourceLoader->clearPreloads();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::sharedObjectPoolClearTimerFired()
</del><ins>+void Document::clearSharedObjectPool()
</ins><span class="cx"> {
</span><span class="cx"> m_sharedObjectPool = nullptr;
</span><ins>+ m_sharedObjectPoolClearTimer.stop();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TELEPHONE_NUMBER_DETECTION)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/Document.h (197838 => 197839)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/Document.h 2016-03-09 07:29:43 UTC (rev 197838)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/Document.h 2016-03-09 07:42:04 UTC (rev 197839)
</span><span class="lines">@@ -1721,7 +1721,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<NamedFlowCollection> m_namedFlows;
</span><span class="cx">
</span><del>- void sharedObjectPoolClearTimerFired();
</del><ins>+ void clearSharedObjectPool();
</ins><span class="cx"> Timer m_sharedObjectPoolClearTimer;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<DocumentSharedObjectPool> m_sharedObjectPool;
</span></span></pre>
</div>
</div>
</body>
</html>