<!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>[168243] trunk/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/168243">168243</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-04 12:44:51 -0700 (Sun, 04 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clear the Selector Query caches on memory pressure
https://bugs.webkit.org/show_bug.cgi?id=132545
Reviewed by Andreas Kling.
The Selector Query Cache can use quite a bit of memory if many
complex selectors are compiled. This patch makes sure the cache gets
cleared on memory pressure.
* dom/Document.cpp:
(WebCore::Document::clearSelectorQueryCache):
(WebCore::Document::setCompatibilityMode):
(WebCore::Document::updateBaseURL):
* dom/Document.h:
* dom/SelectorQuery.cpp:
(WebCore::SelectorQueryCache::invalidate): Deleted.
* dom/SelectorQuery.h:
* platform/MemoryPressureHandler.cpp:
(WebCore::MemoryPressureHandler::releaseMemory):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomSelectorQuerycpp">trunk/Source/WebCore/dom/SelectorQuery.cpp</a></li>
<li><a href="#trunkSourceWebCoredomSelectorQueryh">trunk/Source/WebCore/dom/SelectorQuery.h</a></li>
<li><a href="#trunkSourceWebCoreplatformMemoryPressureHandlercpp">trunk/Source/WebCore/platform/MemoryPressureHandler.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168242 => 168243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-04 09:04:28 UTC (rev 168242)
+++ trunk/Source/WebCore/ChangeLog 2014-05-04 19:44:51 UTC (rev 168243)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-05-04 Benjamin Poulain <benjamin@webkit.org>
+
+ Clear the Selector Query caches on memory pressure
+ https://bugs.webkit.org/show_bug.cgi?id=132545
+
+ Reviewed by Andreas Kling.
+
+ The Selector Query Cache can use quite a bit of memory if many
+ complex selectors are compiled. This patch makes sure the cache gets
+ cleared on memory pressure.
+
+ * dom/Document.cpp:
+ (WebCore::Document::clearSelectorQueryCache):
+ (WebCore::Document::setCompatibilityMode):
+ (WebCore::Document::updateBaseURL):
+ * dom/Document.h:
+ * dom/SelectorQuery.cpp:
+ (WebCore::SelectorQueryCache::invalidate): Deleted.
+ * dom/SelectorQuery.h:
+ * platform/MemoryPressureHandler.cpp:
+ (WebCore::MemoryPressureHandler::releaseMemory):
+
</ins><span class="cx"> 2014-05-04 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> Convert OwnPtr to std::unique_ptr in CDM
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (168242 => 168243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-05-04 09:04:28 UTC (rev 168242)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-05-04 19:44:51 UTC (rev 168243)
</span><span class="lines">@@ -753,6 +753,11 @@
</span><span class="cx"> return m_selectorQueryCache->add(selectorString, *this, ec);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Document::clearSelectorQueryCache()
+{
+ m_selectorQueryCache = nullptr;
+}
+
</ins><span class="cx"> MediaQueryMatcher& Document::mediaQueryMatcher()
</span><span class="cx"> {
</span><span class="cx"> if (!m_mediaQueryMatcher)
</span><span class="lines">@@ -767,8 +772,7 @@
</span><span class="cx"> bool wasInQuirksMode = inQuirksMode();
</span><span class="cx"> m_compatibilityMode = mode;
</span><span class="cx">
</span><del>- if (m_selectorQueryCache)
- m_selectorQueryCache->invalidate();
</del><ins>+ clearSelectorQueryCache();
</ins><span class="cx">
</span><span class="cx"> if (inQuirksMode() != wasInQuirksMode) {
</span><span class="cx"> // All user stylesheets have to reparse using the different mode.
</span><span class="lines">@@ -2614,8 +2618,7 @@
</span><span class="cx"> m_baseURL = URL(ParsedURLString, documentURI());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_selectorQueryCache)
- m_selectorQueryCache->invalidate();
</del><ins>+ clearSelectorQueryCache();
</ins><span class="cx">
</span><span class="cx"> if (!m_baseURL.isValid())
</span><span class="cx"> m_baseURL = URL();
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (168242 => 168243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2014-05-04 09:04:28 UTC (rev 168242)
+++ trunk/Source/WebCore/dom/Document.h 2014-05-04 19:44:51 UTC (rev 168243)
</span><span class="lines">@@ -310,6 +310,7 @@
</span><span class="cx"> HTMLImageElement* imageElementByLowercasedUsemap(const AtomicStringImpl&) const;
</span><span class="cx">
</span><span class="cx"> SelectorQuery* selectorQueryForString(const String&, ExceptionCode&);
</span><ins>+ void clearSelectorQueryCache();
</ins><span class="cx">
</span><span class="cx"> // DOM methods & attributes for Document
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomSelectorQuerycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/SelectorQuery.cpp (168242 => 168243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/SelectorQuery.cpp 2014-05-04 09:04:28 UTC (rev 168242)
+++ trunk/Source/WebCore/dom/SelectorQuery.cpp 2014-05-04 19:44:51 UTC (rev 168243)
</span><span class="lines">@@ -494,9 +494,4 @@
</span><span class="cx"> return m_entries.add(selectors, std::make_unique<SelectorQuery>(std::move(selectorList))).iterator->value.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SelectorQueryCache::invalidate()
-{
- m_entries.clear();
</del><span class="cx"> }
</span><del>-
-}
</del></span></pre></div>
<a id="trunkSourceWebCoredomSelectorQueryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/SelectorQuery.h (168242 => 168243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/SelectorQuery.h 2014-05-04 09:04:28 UTC (rev 168242)
+++ trunk/Source/WebCore/dom/SelectorQuery.h 2014-05-04 19:44:51 UTC (rev 168243)
</span><span class="lines">@@ -113,7 +113,6 @@
</span><span class="cx">
</span><span class="cx"> public:
</span><span class="cx"> SelectorQuery* add(const String&, Document&, ExceptionCode&);
</span><del>- void invalidate();
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> HashMap<String, std::unique_ptr<SelectorQuery>> m_entries;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformMemoryPressureHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/MemoryPressureHandler.cpp (168242 => 168243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MemoryPressureHandler.cpp 2014-05-04 09:04:28 UTC (rev 168242)
+++ trunk/Source/WebCore/platform/MemoryPressureHandler.cpp 2014-05-04 19:44:51 UTC (rev 168243)
</span><span class="lines">@@ -102,6 +102,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> {
</span><ins>+ ReliefLogger log("Discard Selector Query Cache");
+ for (auto* document : Document::allDocuments())
+ document->clearSelectorQueryCache();
+ }
+
+ {
</ins><span class="cx"> ReliefLogger log("Discard all JIT-compiled code");
</span><span class="cx"> gcController().discardAllCompiledCode();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>