<!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>[182608] trunk/Source/WebKit2</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/182608">182608</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-04-09 15:19:33 -0700 (Thu, 09 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Regression(<a href="http://trac.webkit.org/projects/webkit/changeset/182194">r182194</a>): The NetworkProcess is calling the wrong memory pressure handler before suspending
https://bugs.webkit.org/show_bug.cgi?id=143575
<rdar://problem/20484338>
Reviewed by Andreas Kling.
After <a href="http://trac.webkit.org/projects/webkit/changeset/182194">r182194</a>, the NetworkProcess is calling the memory pressure
handler before getting suspended to free-up as much memory as possible
at this point.
However, we were calling the default memory pressure handling code
instead of the custom handler registered by the NetworkProcess. This
patch fixes the problem.
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::lowMemoryHandler):
(WebKit::NetworkProcess::initializeNetworkProcess):
(WebKit::NetworkProcess::processWillSuspend):
* NetworkProcess/NetworkProcess.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessh">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182607 => 182608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-09 21:32:56 UTC (rev 182607)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-09 22:19:33 UTC (rev 182608)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-04-09 Chris Dumez <cdumez@apple.com>
+
+ [WK2] Regression(r182194): The NetworkProcess is calling the wrong memory pressure handler before suspending
+ https://bugs.webkit.org/show_bug.cgi?id=143575
+ <rdar://problem/20484338>
+
+ Reviewed by Andreas Kling.
+
+ After r182194, the NetworkProcess is calling the memory pressure
+ handler before getting suspended to free-up as much memory as possible
+ at this point.
+
+ However, we were calling the default memory pressure handling code
+ instead of the custom handler registered by the NetworkProcess. This
+ patch fixes the problem.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::lowMemoryHandler):
+ (WebKit::NetworkProcess::initializeNetworkProcess):
+ (WebKit::NetworkProcess::processWillSuspend):
+ * NetworkProcess/NetworkProcess.h:
+
</ins><span class="cx"> 2015-04-09 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r182573): Action Menus no longer appear for WebKit2 views displaying an image
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (182607 => 182608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-04-09 21:32:56 UTC (rev 182607)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-04-09 22:19:33 UTC (rev 182608)
</span><span class="lines">@@ -166,6 +166,12 @@
</span><span class="cx"> return authenticationManager();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NetworkProcess::lowMemoryHandler(bool critical)
+{
+ platformLowMemoryHandler(critical);
+ WTF::releaseFastMallocFreeMemory();
+}
+
</ins><span class="cx"> void NetworkProcess::initializeNetworkProcess(const NetworkProcessCreationParameters& parameters)
</span><span class="cx"> {
</span><span class="cx"> platformInitializeNetworkProcess(parameters);
</span><span class="lines">@@ -174,8 +180,7 @@
</span><span class="cx">
</span><span class="cx"> auto& memoryPressureHandler = MemoryPressureHandler::singleton();
</span><span class="cx"> memoryPressureHandler.setLowMemoryHandler([this] (bool critical) {
</span><del>- platformLowMemoryHandler(critical);
- WTF::releaseFastMallocFreeMemory();
</del><ins>+ lowMemoryHandler(critical);
</ins><span class="cx"> });
</span><span class="cx"> memoryPressureHandler.install();
</span><span class="cx">
</span><span class="lines">@@ -506,7 +511,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::processWillSuspend()
</span><span class="cx"> {
</span><del>- MemoryPressureHandler::singleton().releaseMemory(true);
</del><ins>+ lowMemoryHandler(true);
</ins><span class="cx"> parentProcessConnection()->send(Messages::NetworkProcessProxy::ProcessReadyToSuspend(), 0);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (182607 => 182608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2015-04-09 21:32:56 UTC (rev 182607)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2015-04-09 22:19:33 UTC (rev 182608)
</span><span class="lines">@@ -99,6 +99,7 @@
</span><span class="cx"> virtual void terminate() override;
</span><span class="cx"> void platformTerminate();
</span><span class="cx">
</span><ins>+ void lowMemoryHandler(bool critical);
</ins><span class="cx"> void platformLowMemoryHandler(bool critical);
</span><span class="cx">
</span><span class="cx"> // ChildProcess
</span></span></pre>
</div>
</div>
</body>
</html>