<!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>[162904] 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/162904">162904</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2014-01-27 18:56:45 -0800 (Mon, 27 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebKit2] Add SPI to disable the WebCore memory cache
https://bugs.webkit.org/show_bug.cgi?id=127747
Reviewed by Tim Horton.
* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::WebProcessCreationParameters):
Initialized memoryCacheDisabled to false.
(WebKit::WebProcessCreationParameters::encode):
Encoded memoryCacheDisabled.
(WebKit::WebProcessCreationParameters::decode):
Decoded memoryCacheDisabled.
* Shared/WebProcessCreationParameters.h:
* UIProcess/API/C/WKContext.cpp:
(WKContextSetMemoryCacheDisabled):
Called WebContext::setMemoryCacheDisabled().
* UIProcess/API/C/WKContextPrivate.h: Declared new SPI.
* UIProcess/WebContext.cpp:
(WebKit::WebContext::WebContext): Initialized m_memoryCacheDisabled to false.
(WebKit::WebContext::createNewWebProcess):
Set WebProcessCreationParameters::memoryCacheDisabled to m_memoryCacheDisabled.
(WebKit::WebContext::setMemoryCacheDisabled): Set m_memoryCacheDisabled
and sent new value to all existing processes.
* UIProcess/WebContext.h:
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::initializeWebProcess):
Called WebProcess::setMemoryCacheDisabled().
(WebKit::WebProcess::setMemoryCacheDisabled):
Called MemoryCache::setDisabled() if the disabled state changed.
* WebProcess/WebProcess.h:
* WebProcess/WebProcess.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParameterscpp">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParametersh">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextcpp">trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextPrivateh">trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextcpp">trunk/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContexth">trunk/Source/WebKit2/UIProcess/WebContext.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessh">trunk/Source/WebKit2/WebProcess/WebProcess.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessmessagesin">trunk/Source/WebKit2/WebProcess/WebProcess.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (162903 => 162904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-28 02:50:58 UTC (rev 162903)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-28 02:56:45 UTC (rev 162904)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2014-01-27 Andy Estes <aestes@apple.com>
+
+ [WebKit2] Add SPI to disable the WebCore memory cache
+ https://bugs.webkit.org/show_bug.cgi?id=127747
+
+ Reviewed by Tim Horton.
+
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::WebProcessCreationParameters):
+ Initialized memoryCacheDisabled to false.
+ (WebKit::WebProcessCreationParameters::encode):
+ Encoded memoryCacheDisabled.
+ (WebKit::WebProcessCreationParameters::decode):
+ Decoded memoryCacheDisabled.
+ * Shared/WebProcessCreationParameters.h:
+ * UIProcess/API/C/WKContext.cpp:
+ (WKContextSetMemoryCacheDisabled):
+ Called WebContext::setMemoryCacheDisabled().
+ * UIProcess/API/C/WKContextPrivate.h: Declared new SPI.
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::WebContext): Initialized m_memoryCacheDisabled to false.
+ (WebKit::WebContext::createNewWebProcess):
+ Set WebProcessCreationParameters::memoryCacheDisabled to m_memoryCacheDisabled.
+ (WebKit::WebContext::setMemoryCacheDisabled): Set m_memoryCacheDisabled
+ and sent new value to all existing processes.
+ * UIProcess/WebContext.h:
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::initializeWebProcess):
+ Called WebProcess::setMemoryCacheDisabled().
+ (WebKit::WebProcess::setMemoryCacheDisabled):
+ Called MemoryCache::setDisabled() if the disabled state changed.
+ * WebProcess/WebProcess.h:
+ * WebProcess/WebProcess.messages.in:
+
</ins><span class="cx"> 2014-01-27 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add -[WKWebView loadRequest:] API
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (162903 => 162904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2014-01-28 02:50:58 UTC (rev 162903)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2014-01-28 02:56:45 UTC (rev 162904)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="cx"> , usesNetworkProcess(false)
</span><span class="cx"> #endif
</span><ins>+ , memoryCacheDisabled(false)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -116,6 +117,7 @@
</span><span class="cx">
</span><span class="cx"> encoder << plugInAutoStartOriginHashes;
</span><span class="cx"> encoder << plugInAutoStartOrigins;
</span><ins>+ encoder << memoryCacheDisabled;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebProcessCreationParameters::decode(IPC::ArgumentDecoder& decoder, WebProcessCreationParameters& parameters)
</span><span class="lines">@@ -238,6 +240,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.plugInAutoStartOrigins))
</span><span class="cx"> return false;
</span><ins>+ if (!decoder.decode(parameters.memoryCacheDisabled))
+ return false;
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (162903 => 162904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-01-28 02:50:58 UTC (rev 162903)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-01-28 02:56:45 UTC (rev 162904)
</span><span class="lines">@@ -140,6 +140,8 @@
</span><span class="cx">
</span><span class="cx"> HashMap<unsigned, double> plugInAutoStartOriginHashes;
</span><span class="cx"> Vector<String> plugInAutoStartOrigins;
</span><ins>+
+ bool memoryCacheDisabled;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (162903 => 162904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2014-01-28 02:50:58 UTC (rev 162903)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2014-01-28 02:56:45 UTC (rev 162904)
</span><span class="lines">@@ -401,3 +401,8 @@
</span><span class="cx"> {
</span><span class="cx"> WebContext::setInvalidMessageCallback(invalidMessageFunction);
</span><span class="cx"> }
</span><ins>+
+void WKContextSetMemoryCacheDisabled(WKContextRef contextRef, bool disabled)
+{
+ toImpl(contextRef)->setMemoryCacheDisabled(disabled);
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h (162903 => 162904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h 2014-01-28 02:50:58 UTC (rev 162903)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h 2014-01-28 02:56:45 UTC (rev 162904)
</span><span class="lines">@@ -84,6 +84,8 @@
</span><span class="cx">
</span><span class="cx"> typedef void (*WKContextInvalidMessageFunction)(WKStringRef messageName);
</span><span class="cx"> WK_EXPORT void WKContextSetInvalidMessageFunction(WKContextInvalidMessageFunction invalidMessageFunction);
</span><ins>+
+WK_EXPORT void WKContextSetMemoryCacheDisabled(WKContextRef, bool disabled);
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (162903 => 162904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-01-28 02:50:58 UTC (rev 162903)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-01-28 02:56:45 UTC (rev 162904)
</span><span class="lines">@@ -154,6 +154,7 @@
</span><span class="cx"> #if USE(SOUP)
</span><span class="cx"> , m_ignoreTLSErrors(true)
</span><span class="cx"> #endif
</span><ins>+ , m_memoryCacheDisabled(false)
</ins><span class="cx"> {
</span><span class="cx"> platformInitialize();
</span><span class="cx">
</span><span class="lines">@@ -601,6 +602,8 @@
</span><span class="cx"> parameters.plugInAutoStartOriginHashes = m_plugInAutoStartProvider.autoStartOriginHashesCopy();
</span><span class="cx"> copyToVector(m_plugInAutoStartProvider.autoStartOrigins(), parameters.plugInAutoStartOrigins);
</span><span class="cx">
</span><ins>+ parameters.memoryCacheDisabled = m_memoryCacheDisabled;
+
</ins><span class="cx"> // Add any platform specific parameters
</span><span class="cx"> platformInitializeWebProcess(parameters);
</span><span class="cx">
</span><span class="lines">@@ -1368,5 +1371,11 @@
</span><span class="cx"> m_client.plugInInformationBecameAvailable(this, API::Array::create(std::move(plugins)).get());
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><ins>+
+void WebContext::setMemoryCacheDisabled(bool disabled)
+{
+ m_memoryCacheDisabled = disabled;
+ sendToAllProcesses(Messages::WebProcess::SetMemoryCacheDisabled(disabled));
+}
</ins><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (162903 => 162904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.h 2014-01-28 02:50:58 UTC (rev 162903)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2014-01-28 02:56:45 UTC (rev 162904)
</span><span class="lines">@@ -328,6 +328,8 @@
</span><span class="cx"> void updateProcessSuppressionState() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ void setMemoryCacheDisabled(bool);
+
</ins><span class="cx"> private:
</span><span class="cx"> void platformInitialize();
</span><span class="cx">
</span><span class="lines">@@ -513,6 +515,8 @@
</span><span class="cx"> #if USE(SOUP)
</span><span class="cx"> bool m_ignoreTLSErrors;
</span><span class="cx"> #endif
</span><ins>+
+ bool m_memoryCacheDisabled;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (162903 => 162904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-01-28 02:50:58 UTC (rev 162903)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-01-28 02:56:45 UTC (rev 162904)
</span><span class="lines">@@ -356,6 +356,8 @@
</span><span class="cx"> resetPlugInAutoStartOriginHashes(parameters.plugInAutoStartOriginHashes);
</span><span class="cx"> for (size_t i = 0; i < parameters.plugInAutoStartOrigins.size(); ++i)
</span><span class="cx"> m_plugInAutoStartOrigins.add(parameters.plugInAutoStartOrigins[i]);
</span><ins>+
+ setMemoryCacheDisabled(parameters.memoryCacheDisabled);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="lines">@@ -1193,4 +1195,10 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebProcess::setMemoryCacheDisabled(bool disabled)
+{
+ if (memoryCache()->disabled() != disabled)
+ memoryCache()->setDisabled(disabled);
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (162903 => 162904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2014-01-28 02:50:58 UTC (rev 162903)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2014-01-28 02:56:45 UTC (rev 162904)
</span><span class="lines">@@ -243,6 +243,8 @@
</span><span class="cx"> void setIgnoreTLSErrors(bool);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ void setMemoryCacheDisabled(bool);
+
</ins><span class="cx"> void postInjectedBundleMessage(const IPC::DataReference& messageData);
</span><span class="cx">
</span><span class="cx"> // ChildProcess
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.messages.in (162903 => 162904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2014-01-28 02:50:58 UTC (rev 162903)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2014-01-28 02:56:45 UTC (rev 162904)
</span><span class="lines">@@ -87,4 +87,6 @@
</span><span class="cx"> #if USE(SOUP)
</span><span class="cx"> AllowSpecificHTTPSCertificateForHost(WebCore::CertificateInfo certificate, String host)
</span><span class="cx"> #endif
</span><ins>+
+ SetMemoryCacheDisabled(bool disabled);
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>