<!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>[182259] 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/182259">182259</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2015-04-01 15:50:53 -0700 (Wed, 01 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] WebContent should have access to the entirety of its caches directory
https://bugs.webkit.org/show_bug.cgi?id=143312
rdar://problem/20314916
Reviewed by Oliver Hunt.
* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
(WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
* Shared/Network/NetworkProcessCreationParameters.cpp:
(WebKit::NetworkProcessCreationParameters::encode):
(WebKit::NetworkProcessCreationParameters::decode):
* Shared/Network/NetworkProcessCreationParameters.h:
* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):
* Shared/WebProcessCreationParameters.h:
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::networkingCachesDirectory):
(WebKit::WebProcessPool::webContentCachesDirectory):
(WebKit::WebProcessPool::openGLCacheDirectory): Deleted.
(WebKit::WebProcessPool::networkingHSTSDatabasePath): Deleted.
(WebKit::WebProcessPool::webContentHSTSDatabasePath): Deleted.
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::ensureNetworkProcess):
(WebKit::WebProcessPool::createNewWebProcess):
* UIProcess/WebProcessPool.h:
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformInitializeWebProcess):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkNetworkProcessCreationParameterscpp">trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkNetworkProcessCreationParametersh">trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h</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="#trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolh">trunk/Source/WebKit2/UIProcess/WebProcessPool.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm">trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182258 => 182259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-01 22:48:33 UTC (rev 182258)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-01 22:50:53 UTC (rev 182259)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2015-04-01 Alexey Proskuryakov <ap@apple.com>
+
+ [iOS] WebContent should have access to the entirety of its caches directory
+ https://bugs.webkit.org/show_bug.cgi?id=143312
+ rdar://problem/20314916
+
+ Reviewed by Oliver Hunt.
+
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+ * Shared/Network/NetworkProcessCreationParameters.cpp:
+ (WebKit::NetworkProcessCreationParameters::encode):
+ (WebKit::NetworkProcessCreationParameters::decode):
+ * Shared/Network/NetworkProcessCreationParameters.h:
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::encode):
+ (WebKit::WebProcessCreationParameters::decode):
+ * Shared/WebProcessCreationParameters.h:
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::networkingCachesDirectory):
+ (WebKit::WebProcessPool::webContentCachesDirectory):
+ (WebKit::WebProcessPool::openGLCacheDirectory): Deleted.
+ (WebKit::WebProcessPool::networkingHSTSDatabasePath): Deleted.
+ (WebKit::WebProcessPool::webContentHSTSDatabasePath): Deleted.
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::ensureNetworkProcess):
+ (WebKit::WebProcessPool::createNewWebProcess):
+ * UIProcess/WebProcessPool.h:
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+
</ins><span class="cx"> 2015-04-01 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Smart magnification gesture sometimes shoots to the middle of the page
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (182258 => 182259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-04-01 22:48:33 UTC (rev 182258)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-04-01 22:50:53 UTC (rev 182259)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.cookieStorageDirectoryExtensionHandle);
</span><del>- SandboxExtension::consumePermanently(parameters.hstsDatabasePathExtensionHandle);
</del><ins>+ SandboxExtension::consumePermanently(parameters.containerCachesDirectoryExtensionHandle);
</ins><span class="cx"> SandboxExtension::consumePermanently(parameters.parentBundleDirectoryExtensionHandle);
</span><span class="cx"> #endif
</span><span class="cx"> m_diskCacheDirectory = parameters.diskCacheDirectory;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkNetworkProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp (182258 => 182259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2015-04-01 22:48:33 UTC (rev 182258)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2015-04-01 22:50:53 UTC (rev 182259)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> encoder << cookieStorageDirectory;
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> encoder << cookieStorageDirectoryExtensionHandle;
</span><del>- encoder << hstsDatabasePathExtensionHandle;
</del><ins>+ encoder << containerCachesDirectoryExtensionHandle;
</ins><span class="cx"> encoder << parentBundleDirectoryExtensionHandle;
</span><span class="cx"> #endif
</span><span class="cx"> encoder << shouldUseTestingNetworkSession;
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (!decoder.decode(result.cookieStorageDirectoryExtensionHandle))
</span><span class="cx"> return false;
</span><del>- if (!decoder.decode(result.hstsDatabasePathExtensionHandle))
</del><ins>+ if (!decoder.decode(result.containerCachesDirectoryExtensionHandle))
</ins><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(result.parentBundleDirectoryExtensionHandle))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkNetworkProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h (182258 => 182259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2015-04-01 22:48:33 UTC (rev 182258)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2015-04-01 22:50:53 UTC (rev 182259)
</span><span class="lines">@@ -67,8 +67,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> SandboxExtension::Handle cookieStorageDirectoryExtensionHandle;
</span><span class="cx">
</span><del>- // FIXME: Remove this once <rdar://problem/17726660> is fixed.
- SandboxExtension::Handle hstsDatabasePathExtensionHandle;
</del><ins>+ SandboxExtension::Handle containerCachesDirectoryExtensionHandle;
</ins><span class="cx">
</span><span class="cx"> SandboxExtension::Handle parentBundleDirectoryExtensionHandle;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (182258 => 182259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2015-04-01 22:48:33 UTC (rev 182258)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2015-04-01 22:50:53 UTC (rev 182259)
</span><span class="lines">@@ -76,9 +76,8 @@
</span><span class="cx"> encoder << cookieStorageDirectory;
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> encoder << cookieStorageDirectoryExtensionHandle;
</span><del>- encoder << openGLCacheDirectoryExtensionHandle;
</del><ins>+ encoder << containerCachesDirectoryExtensionHandle;
</ins><span class="cx"> encoder << containerTemporaryDirectoryExtensionHandle;
</span><del>- encoder << hstsDatabasePathExtensionHandle;
</del><span class="cx"> #endif
</span><span class="cx"> encoder << mediaKeyStorageDirectory;
</span><span class="cx"> encoder << mediaKeyStorageDirectoryExtensionHandle;
</span><span class="lines">@@ -182,12 +181,10 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (!decoder.decode(parameters.cookieStorageDirectoryExtensionHandle))
</span><span class="cx"> return false;
</span><del>- if (!decoder.decode(parameters.openGLCacheDirectoryExtensionHandle))
</del><ins>+ if (!decoder.decode(parameters.containerCachesDirectoryExtensionHandle))
</ins><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.containerTemporaryDirectoryExtensionHandle))
</span><span class="cx"> return false;
</span><del>- if (!decoder.decode(parameters.hstsDatabasePathExtensionHandle))
- return false;
</del><span class="cx"> #endif
</span><span class="cx"> if (!decoder.decode(parameters.mediaKeyStorageDirectory))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (182258 => 182259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2015-04-01 22:48:33 UTC (rev 182258)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2015-04-01 22:50:53 UTC (rev 182259)
</span><span class="lines">@@ -77,10 +77,8 @@
</span><span class="cx"> String cookieStorageDirectory;
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> SandboxExtension::Handle cookieStorageDirectoryExtensionHandle;
</span><del>- SandboxExtension::Handle openGLCacheDirectoryExtensionHandle;
</del><ins>+ SandboxExtension::Handle containerCachesDirectoryExtensionHandle;
</ins><span class="cx"> SandboxExtension::Handle containerTemporaryDirectoryExtensionHandle;
</span><del>- // FIXME: Remove this once <rdar://problem/17726660> is fixed.
- SandboxExtension::Handle hstsDatabasePathExtensionHandle;
</del><span class="cx"> #endif
</span><span class="cx"> SandboxExtension::Handle mediaKeyStorageDirectoryExtensionHandle;
</span><span class="cx"> String mediaKeyStorageDirectory;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (182258 => 182259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-04-01 22:48:33 UTC (rev 182258)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-04-01 22:50:53 UTC (rev 182259)
</span><span class="lines">@@ -295,22 +295,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-String WebProcessPool::openGLCacheDirectory() const
-{
- String path = pathForProcessContainer();
- if (path.isEmpty())
- path = NSHomeDirectory();
-
- path = path + "/Library/Caches/com.apple.WebKit.WebContent/com.apple.opengl/";
- return stringByResolvingSymlinksInPath(path);
-}
-
</del><span class="cx"> String WebProcessPool::parentBundleDirectory() const
</span><span class="cx"> {
</span><span class="cx"> return [[[NSBundle mainBundle] bundlePath] stringByStandardizingPath];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String WebProcessPool::networkingHSTSDatabasePath() const
</del><ins>+String WebProcessPool::networkingCachesDirectory() const
</ins><span class="cx"> {
</span><span class="cx"> String path = pathForProcessContainer();
</span><span class="cx"> if (path.isEmpty())
</span><span class="lines">@@ -326,10 +316,10 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return path + "/HSTS.plist";
</del><ins>+ return path;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-String WebProcessPool::webContentHSTSDatabasePath() const
</del><ins>+String WebProcessPool::webContentCachesDirectory() const
</ins><span class="cx"> {
</span><span class="cx"> String path = pathForProcessContainer();
</span><span class="cx"> if (path.isEmpty())
</span><span class="lines">@@ -345,7 +335,7 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return path + "/HSTS.plist";
</del><ins>+ return path;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebProcessPool::containerTemporaryDirectory() const
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (182258 => 182259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-04-01 22:48:33 UTC (rev 182258)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-04-01 22:50:53 UTC (rev 182259)
</span><span class="lines">@@ -417,9 +417,9 @@
</span><span class="cx"> if (!parameters.cookieStorageDirectory.isEmpty())
</span><span class="cx"> SandboxExtension::createHandleForReadWriteDirectory(parameters.cookieStorageDirectory, parameters.cookieStorageDirectoryExtensionHandle);
</span><span class="cx">
</span><del>- String hstsDatabasePath = networkingHSTSDatabasePath();
- if (!hstsDatabasePath.isEmpty())
- SandboxExtension::createHandle(hstsDatabasePath, SandboxExtension::ReadWrite, parameters.hstsDatabasePathExtensionHandle);
</del><ins>+ String containerCachesDirectory = this->networkingCachesDirectory();
+ if (!containerCachesDirectory.isEmpty())
+ SandboxExtension::createHandleForReadWriteDirectory(containerCachesDirectory, parameters.containerCachesDirectoryExtensionHandle);
</ins><span class="cx">
</span><span class="cx"> String parentBundleDirectory = this->parentBundleDirectory();
</span><span class="cx"> if (!parentBundleDirectory.isEmpty())
</span><span class="lines">@@ -616,17 +616,13 @@
</span><span class="cx"> if (!parameters.cookieStorageDirectory.isEmpty())
</span><span class="cx"> SandboxExtension::createHandleForReadWriteDirectory(parameters.cookieStorageDirectory, parameters.cookieStorageDirectoryExtensionHandle);
</span><span class="cx">
</span><del>- String openGLCacheDirectory = this->openGLCacheDirectory();
- if (!openGLCacheDirectory.isEmpty())
- SandboxExtension::createHandleForReadWriteDirectory(openGLCacheDirectory, parameters.openGLCacheDirectoryExtensionHandle);
</del><ins>+ String containerCachesDirectory = this->webContentCachesDirectory();
+ if (!containerCachesDirectory.isEmpty())
+ SandboxExtension::createHandleForReadWriteDirectory(containerCachesDirectory, parameters.containerCachesDirectoryExtensionHandle);
</ins><span class="cx">
</span><span class="cx"> String containerTemporaryDirectory = this->containerTemporaryDirectory();
</span><span class="cx"> if (!containerTemporaryDirectory.isEmpty())
</span><span class="cx"> SandboxExtension::createHandleForReadWriteDirectory(containerTemporaryDirectory, parameters.containerTemporaryDirectoryExtensionHandle);
</span><del>-
- String hstsDatabasePath = webContentHSTSDatabasePath();
- if (!hstsDatabasePath.isEmpty())
- SandboxExtension::createHandle(hstsDatabasePath, SandboxExtension::ReadWrite, parameters.hstsDatabasePathExtensionHandle);
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> parameters.mediaKeyStorageDirectory = m_mediaKeysStorageDirectory;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (182258 => 182259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-04-01 22:48:33 UTC (rev 182258)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-04-01 22:50:53 UTC (rev 182259)
</span><span class="lines">@@ -402,10 +402,9 @@
</span><span class="cx"> String platformDefaultCookieStorageDirectory() const;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- String openGLCacheDirectory() const;
</del><span class="cx"> String parentBundleDirectory() const;
</span><del>- String networkingHSTSDatabasePath() const;
- String webContentHSTSDatabasePath() const;
</del><ins>+ String networkingCachesDirectory() const;
+ String webContentCachesDirectory() const;
</ins><span class="cx"> String containerTemporaryDirectory() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (182258 => 182259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2015-04-01 22:48:33 UTC (rev 182258)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2015-04-01 22:50:53 UTC (rev 182259)
</span><span class="lines">@@ -162,9 +162,8 @@
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.mediaKeyStorageDirectoryExtensionHandle);
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.cookieStorageDirectoryExtensionHandle);
</span><del>- SandboxExtension::consumePermanently(parameters.openGLCacheDirectoryExtensionHandle);
</del><ins>+ SandboxExtension::consumePermanently(parameters.containerCachesDirectoryExtensionHandle);
</ins><span class="cx"> SandboxExtension::consumePermanently(parameters.containerTemporaryDirectoryExtensionHandle);
</span><del>- SandboxExtension::consumePermanently(parameters.hstsDatabasePathExtensionHandle);
</del><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>