<!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>[172500] 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/172500">172500</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-08-12 15:43:27 -0700 (Tue, 12 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION: WebContent process has a sandbox extension for the entirety of user's temp directory
https://bugs.webkit.org/show_bug.cgi?id=135853
<rdar://problem/17986556>
Reviewed by Oliver hunt.
Move extensions recently added for iOS benefit under PLATFORM(IOS). Removed some
dead code while at it (child processes don't need actual paths, they only need
sandbox extensions in most cases).
* 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/WebContext.cpp:
(WebKit::WebContext::ensureNetworkProcess):
(WebKit::WebContext::createNewWebProcess):
(WebKit::WebContext::openGLCacheDirectory): Deleted.
(WebKit::WebContext::networkingHSTSDatabasePath): Deleted.
* UIProcess/WebContext.h:
* UIProcess/efl/WebContextEfl.cpp:
(WebKit::WebContext::containerTemporaryDirectory): Deleted.
(WebKit::WebContext::platformDefaultNetworkingHSTSDatabasePath): Deleted.
* UIProcess/gtk/WebContextGtk.cpp:
(WebKit::WebContext::containerTemporaryDirectory): Deleted.
(WebKit::WebContext::platformDefaultNetworkingHSTSDatabasePath): Deleted.
* UIProcess/mac/WebContextMac.mm:
(WebKit::WebContext::openGLCacheDirectory):
(WebKit::WebContext::parentBundleDirectory):
(WebKit::WebContext::networkingHSTSDatabasePath):
(WebKit::WebContext::platformDefaultOpenGLCacheDirectory): Deleted.
(WebKit::WebContext::platformDefaultNetworkingHSTSDatabasePath): Deleted.
* 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="#trunkSourceWebKit2UIProcessWebContextcpp">trunk/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContexth">trunk/Source/WebKit2/UIProcess/WebContext.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflWebContextEflcpp">trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebContextGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMacmm">trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm</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 (172499 => 172500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-08-12 22:43:19 UTC (rev 172499)
+++ trunk/Source/WebKit2/ChangeLog 2014-08-12 22:43:27 UTC (rev 172500)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2014-08-12 Alexey Proskuryakov <ap@apple.com>
+
+ REGRESSION: WebContent process has a sandbox extension for the entirety of user's temp directory
+ https://bugs.webkit.org/show_bug.cgi?id=135853
+ <rdar://problem/17986556>
+
+ Reviewed by Oliver hunt.
+
+ Move extensions recently added for iOS benefit under PLATFORM(IOS). Removed some
+ dead code while at it (child processes don't need actual paths, they only need
+ sandbox extensions in most cases).
+
+ * 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/WebContext.cpp:
+ (WebKit::WebContext::ensureNetworkProcess):
+ (WebKit::WebContext::createNewWebProcess):
+ (WebKit::WebContext::openGLCacheDirectory): Deleted.
+ (WebKit::WebContext::networkingHSTSDatabasePath): Deleted.
+ * UIProcess/WebContext.h:
+ * UIProcess/efl/WebContextEfl.cpp:
+ (WebKit::WebContext::containerTemporaryDirectory): Deleted.
+ (WebKit::WebContext::platformDefaultNetworkingHSTSDatabasePath): Deleted.
+ * UIProcess/gtk/WebContextGtk.cpp:
+ (WebKit::WebContext::containerTemporaryDirectory): Deleted.
+ (WebKit::WebContext::platformDefaultNetworkingHSTSDatabasePath): Deleted.
+ * UIProcess/mac/WebContextMac.mm:
+ (WebKit::WebContext::openGLCacheDirectory):
+ (WebKit::WebContext::parentBundleDirectory):
+ (WebKit::WebContext::networkingHSTSDatabasePath):
+ (WebKit::WebContext::platformDefaultOpenGLCacheDirectory): Deleted.
+ (WebKit::WebContext::platformDefaultNetworkingHSTSDatabasePath): Deleted.
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+
</ins><span class="cx"> 2014-08-12 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r172424): Extra menu header in combined telephone number menu when no phone paired
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (172499 => 172500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2014-08-12 22:43:19 UTC (rev 172499)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2014-08-12 22:43:27 UTC (rev 172500)
</span><span class="lines">@@ -60,8 +60,8 @@
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::platformInitializeNetworkProcessCocoa(const NetworkProcessCreationParameters& parameters)
</span><span class="cx"> {
</span><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> SandboxExtension::consumePermanently(parameters.cookieStorageDirectoryExtensionHandle);
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> SandboxExtension::consumePermanently(parameters.hstsDatabasePathExtensionHandle);
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.parentBundleDirectoryExtensionHandle);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkNetworkProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp (172499 => 172500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2014-08-12 22:43:19 UTC (rev 172499)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2014-08-12 22:43:27 UTC (rev 172500)
</span><span class="lines">@@ -43,11 +43,9 @@
</span><span class="cx"> encoder << diskCacheDirectory;
</span><span class="cx"> encoder << diskCacheDirectoryExtensionHandle;
</span><span class="cx"> encoder << cookieStorageDirectory;
</span><del>- encoder << cookieStorageDirectoryExtensionHandle;
</del><span class="cx"> #if PLATFORM(IOS)
</span><del>- encoder << hstsDatabasePath;
</del><ins>+ encoder << cookieStorageDirectoryExtensionHandle;
</ins><span class="cx"> encoder << hstsDatabasePathExtensionHandle;
</span><del>- encoder << parentBundleDirectory;
</del><span class="cx"> encoder << parentBundleDirectoryExtensionHandle;
</span><span class="cx"> #endif
</span><span class="cx"> encoder << shouldUseTestingNetworkSession;
</span><span class="lines">@@ -83,15 +81,11 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(result.cookieStorageDirectory))
</span><span class="cx"> return false;
</span><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> if (!decoder.decode(result.cookieStorageDirectoryExtensionHandle))
</span><span class="cx"> return false;
</span><del>-#if PLATFORM(IOS)
- if (!decoder.decode(result.hstsDatabasePath))
- return false;
</del><span class="cx"> if (!decoder.decode(result.hstsDatabasePathExtensionHandle))
</span><span class="cx"> return false;
</span><del>- if (!decoder.decode(result.parentBundleDirectory))
- return false;
</del><span class="cx"> if (!decoder.decode(result.parentBundleDirectoryExtensionHandle))
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkNetworkProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h (172499 => 172500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2014-08-12 22:43:19 UTC (rev 172499)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2014-08-12 22:43:27 UTC (rev 172500)
</span><span class="lines">@@ -57,14 +57,13 @@
</span><span class="cx"> SandboxExtension::Handle diskCacheDirectoryExtensionHandle;
</span><span class="cx">
</span><span class="cx"> String cookieStorageDirectory;
</span><del>- SandboxExtension::Handle cookieStorageDirectoryExtensionHandle;
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+ SandboxExtension::Handle cookieStorageDirectoryExtensionHandle;
+
</ins><span class="cx"> // FIXME: Remove this once <rdar://problem/17726660> is fixed.
</span><del>- String hstsDatabasePath;
</del><span class="cx"> SandboxExtension::Handle hstsDatabasePathExtensionHandle;
</span><span class="cx">
</span><del>- String parentBundleDirectory;
</del><span class="cx"> SandboxExtension::Handle parentBundleDirectoryExtensionHandle;
</span><span class="cx"> #endif
</span><span class="cx"> bool shouldUseTestingNetworkSession;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (172499 => 172500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2014-08-12 22:43:19 UTC (rev 172499)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2014-08-12 22:43:27 UTC (rev 172500)
</span><span class="lines">@@ -67,13 +67,10 @@
</span><span class="cx"> encoder << diskCacheDirectory;
</span><span class="cx"> encoder << diskCacheDirectoryExtensionHandle;
</span><span class="cx"> encoder << cookieStorageDirectory;
</span><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> encoder << cookieStorageDirectoryExtensionHandle;
</span><del>- encoder << openGLCacheDirectory;
</del><span class="cx"> encoder << openGLCacheDirectoryExtensionHandle;
</span><del>- encoder << containerTemporaryDirectory;
</del><span class="cx"> encoder << containerTemporaryDirectoryExtensionHandle;
</span><del>-#if PLATFORM(IOS)
- encoder << hstsDatabasePath;
</del><span class="cx"> encoder << hstsDatabasePathExtensionHandle;
</span><span class="cx"> #endif
</span><span class="cx"> encoder << shouldUseTestingNetworkSession;
</span><span class="lines">@@ -167,19 +164,13 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.cookieStorageDirectory))
</span><span class="cx"> return false;
</span><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> if (!decoder.decode(parameters.cookieStorageDirectoryExtensionHandle))
</span><span class="cx"> return false;
</span><del>- if (!decoder.decode(parameters.openGLCacheDirectory))
- return false;
</del><span class="cx"> if (!decoder.decode(parameters.openGLCacheDirectoryExtensionHandle))
</span><span class="cx"> return false;
</span><del>- if (!decoder.decode(parameters.containerTemporaryDirectory))
- return false;
</del><span class="cx"> if (!decoder.decode(parameters.containerTemporaryDirectoryExtensionHandle))
</span><span class="cx"> return false;
</span><del>-#if PLATFORM(IOS)
- if (!decoder.decode(parameters.hstsDatabasePath))
- return false;
</del><span class="cx"> if (!decoder.decode(parameters.hstsDatabasePathExtensionHandle))
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (172499 => 172500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-08-12 22:43:19 UTC (rev 172499)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-08-12 22:43:27 UTC (rev 172500)
</span><span class="lines">@@ -71,15 +71,11 @@
</span><span class="cx"> String diskCacheDirectory;
</span><span class="cx"> SandboxExtension::Handle diskCacheDirectoryExtensionHandle;
</span><span class="cx"> String cookieStorageDirectory;
</span><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> SandboxExtension::Handle cookieStorageDirectoryExtensionHandle;
</span><del>- String openGLCacheDirectory;
</del><span class="cx"> SandboxExtension::Handle openGLCacheDirectoryExtensionHandle;
</span><del>- String containerTemporaryDirectory;
</del><span class="cx"> SandboxExtension::Handle containerTemporaryDirectoryExtensionHandle;
</span><del>-
-#if PLATFORM(IOS)
</del><span class="cx"> // FIXME: Remove this once <rdar://problem/17726660> is fixed.
</span><del>- String hstsDatabasePath;
</del><span class="cx"> SandboxExtension::Handle hstsDatabasePathExtensionHandle;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (172499 => 172500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-08-12 22:43:19 UTC (rev 172499)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-08-12 22:43:27 UTC (rev 172500)
</span><span class="lines">@@ -421,17 +421,18 @@
</span><span class="cx"> SandboxExtension::createHandleForReadWriteDirectory(parameters.diskCacheDirectory, parameters.diskCacheDirectoryExtensionHandle);
</span><span class="cx">
</span><span class="cx"> parameters.cookieStorageDirectory = cookieStorageDirectory();
</span><ins>+
+#if PLATFORM(IOS)
</ins><span class="cx"> if (!parameters.cookieStorageDirectory.isEmpty())
</span><span class="cx"> SandboxExtension::createHandleForReadWriteDirectory(parameters.cookieStorageDirectory, parameters.cookieStorageDirectoryExtensionHandle);
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- parameters.hstsDatabasePath = networkingHSTSDatabasePath();
- if (!parameters.hstsDatabasePath.isEmpty())
- SandboxExtension::createHandle(parameters.hstsDatabasePath, SandboxExtension::ReadWrite, parameters.hstsDatabasePathExtensionHandle);
</del><ins>+ String hstsDatabasePath = networkingHSTSDatabasePath();
+ if (!hstsDatabasePath.isEmpty())
+ SandboxExtension::createHandle(hstsDatabasePath, SandboxExtension::ReadWrite, parameters.hstsDatabasePathExtensionHandle);
</ins><span class="cx">
</span><del>- parameters.parentBundleDirectory = parentBundleDirectory();
- if (!parameters.parentBundleDirectory.isEmpty())
- SandboxExtension::createHandle(parameters.parentBundleDirectory, SandboxExtension::ReadOnly, parameters.parentBundleDirectoryExtensionHandle);
</del><ins>+ String parentBundleDirectory = parentBundleDirectory();
+ if (!parentBundleDirectory.isEmpty())
+ SandboxExtension::createHandle(parentBundleDirectory, SandboxExtension::ReadOnly, parameters.parentBundleDirectoryExtensionHandle);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> parameters.shouldUseTestingNetworkSession = m_shouldUseTestingNetworkSession;
</span><span class="lines">@@ -618,21 +619,22 @@
</span><span class="cx"> SandboxExtension::createHandleForReadWriteDirectory(parameters.diskCacheDirectory, parameters.diskCacheDirectoryExtensionHandle);
</span><span class="cx">
</span><span class="cx"> parameters.cookieStorageDirectory = cookieStorageDirectory();
</span><ins>+
+#if PLATFORM(IOS)
</ins><span class="cx"> if (!parameters.cookieStorageDirectory.isEmpty())
</span><span class="cx"> SandboxExtension::createHandleForReadWriteDirectory(parameters.cookieStorageDirectory, parameters.cookieStorageDirectoryExtensionHandle);
</span><span class="cx">
</span><del>- parameters.openGLCacheDirectory = openGLCacheDirectory();
- if (!parameters.openGLCacheDirectory.isEmpty())
- SandboxExtension::createHandleForReadWriteDirectory(parameters.openGLCacheDirectory, parameters.openGLCacheDirectoryExtensionHandle);
</del><ins>+ String openGLCacheDirectory = openGLCacheDirectory();
+ if (!openGLCacheDirectory.isEmpty())
+ SandboxExtension::createHandleForReadWriteDirectory(openGLCacheDirectory, parameters.openGLCacheDirectoryExtensionHandle);
</ins><span class="cx">
</span><del>- parameters.containerTemporaryDirectory = containerTemporaryDirectory();
- if (!parameters.containerTemporaryDirectory.isEmpty())
- SandboxExtension::createHandleForReadWriteDirectory(parameters.containerTemporaryDirectory, parameters.containerTemporaryDirectoryExtensionHandle);
</del><ins>+ String containerTemporaryDirectory = containerTemporaryDirectory();
+ if (!containerTemporaryDirectory.isEmpty())
+ SandboxExtension::createHandleForReadWriteDirectory(containerTemporaryDirectory, parameters.containerTemporaryDirectoryExtensionHandle);
</ins><span class="cx">
</span><del>-#if PLATFORM(IOS)
- parameters.hstsDatabasePath = webContentHSTSDatabasePath();
- if (!parameters.hstsDatabasePath.isEmpty())
- SandboxExtension::createHandle(parameters.hstsDatabasePath, SandboxExtension::ReadWrite, parameters.hstsDatabasePathExtensionHandle);
</del><ins>+ String hstsDatabasePath = webContentHSTSDatabasePath();
+ if (!hstsDatabasePath.isEmpty())
+ SandboxExtension::createHandle(hstsDatabasePath, SandboxExtension::ReadWrite, parameters.hstsDatabasePathExtensionHandle);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> parameters.shouldUseTestingNetworkSession = m_shouldUseTestingNetworkSession;
</span><span class="lines">@@ -1221,19 +1223,6 @@
</span><span class="cx"> return platformDefaultCookieStorageDirectory();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String WebContext::openGLCacheDirectory() const
-{
- if (!m_overrideOpenGLCacheDirectory.isEmpty())
- return m_overrideOpenGLCacheDirectory;
-
- return platformDefaultOpenGLCacheDirectory();
-}
-
-String WebContext::networkingHSTSDatabasePath() const
-{
- return platformDefaultNetworkingHSTSDatabasePath();
-}
-
</del><span class="cx"> void WebContext::useTestingNetworkSession()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_processes.isEmpty());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (172499 => 172500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.h 2014-08-12 22:43:19 UTC (rev 172499)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2014-08-12 22:43:27 UTC (rev 172500)
</span><span class="lines">@@ -423,19 +423,14 @@
</span><span class="cx"> String cookieStorageDirectory() const;
</span><span class="cx"> String platformDefaultCookieStorageDirectory() const;
</span><span class="cx">
</span><del>- String openGLCacheDirectory() const;
- String platformDefaultOpenGLCacheDirectory() const;
-
- String networkingHSTSDatabasePath() const;
- String platformDefaultNetworkingHSTSDatabasePath() const;
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><ins>+ String openGLCacheDirectory() const;
</ins><span class="cx"> String parentBundleDirectory() const;
</span><ins>+ String networkingHSTSDatabasePath() const;
</ins><span class="cx"> String webContentHSTSDatabasePath() const;
</span><ins>+ String containerTemporaryDirectory() const;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- String containerTemporaryDirectory() const;
-
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> void registerNotificationObservers();
</span><span class="cx"> void unregisterNotificationObservers();
</span><span class="lines">@@ -531,7 +526,6 @@
</span><span class="cx"> String m_overrideIconDatabasePath;
</span><span class="cx"> String m_overrideDiskCacheDirectory;
</span><span class="cx"> String m_overrideCookieStorageDirectory;
</span><del>- String m_overrideOpenGLCacheDirectory;
</del><span class="cx">
</span><span class="cx"> String m_webSQLDatabaseDirectory;
</span><span class="cx"> String m_indexedDBDatabaseDirectory;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflWebContextEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp (172499 => 172500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp 2014-08-12 22:43:19 UTC (rev 172499)
+++ trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp 2014-08-12 22:43:27 UTC (rev 172500)
</span><span class="lines">@@ -132,24 +132,6 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String WebContext::platformDefaultOpenGLCacheDirectory() const
-{
- notImplemented();
- return String();
-}
-
-String WebContext::containerTemporaryDirectory() const
-{
- notImplemented();
- return String();
-}
-
-String WebContext::platformDefaultNetworkingHSTSDatabasePath() const
-{
- notImplemented();
- return String();
-}
-
</del><span class="cx"> void WebContext::setIgnoreTLSErrors(bool ignoreTLSErrors)
</span><span class="cx"> {
</span><span class="cx"> m_ignoreTLSErrors = ignoreTLSErrors;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebContextGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp (172499 => 172500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp 2014-08-12 22:43:19 UTC (rev 172499)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp 2014-08-12 22:43:27 UTC (rev 172500)
</span><span class="lines">@@ -148,24 +148,6 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String WebContext::platformDefaultOpenGLCacheDirectory() const
-{
- notImplemented();
- return String();
-}
-
-String WebContext::containerTemporaryDirectory() const
-{
- notImplemented();
- return String();
-}
-
-String WebContext::platformDefaultNetworkingHSTSDatabasePath() const
-{
- notImplemented();
- return String();
-}
-
</del><span class="cx"> void WebContext::setIgnoreTLSErrors(bool ignoreTLSErrors)
</span><span class="cx"> {
</span><span class="cx"> m_ignoreTLSErrors = ignoreTLSErrors;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm (172499 => 172500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-08-12 22:43:19 UTC (rev 172499)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-08-12 22:43:27 UTC (rev 172500)
</span><span class="lines">@@ -284,24 +284,24 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String WebContext::platformDefaultOpenGLCacheDirectory() const
-{
</del><span class="cx"> #if PLATFORM(IOS)
</span><ins>+String WebContext::openGLCacheDirectory() const
+{
</ins><span class="cx"> String path = pathForProcessContainer();
</span><span class="cx"> if (path.isEmpty())
</span><span class="cx"> path = NSHomeDirectory();
</span><span class="cx">
</span><span class="cx"> path = path + "/Library/Caches/com.apple.WebKit.WebContent/com.apple.opengl/";
</span><span class="cx"> return stringByResolvingSymlinksInPath(path);
</span><del>-#else
- notImplemented();
- return [@"" stringByStandardizingPath];
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><del>-String WebContext::platformDefaultNetworkingHSTSDatabasePath() const
</del><ins>+String WebContext::parentBundleDirectory() const
</ins><span class="cx"> {
</span><del>-#if PLATFORM(IOS)
</del><ins>+ return [[[NSBundle mainBundle] bundlePath] stringByStandardizingPath];
+}
+
+String WebContext::networkingHSTSDatabasePath() const
+{
</ins><span class="cx"> String path = pathForProcessContainer();
</span><span class="cx"> if (path.isEmpty())
</span><span class="cx"> path = NSHomeDirectory();
</span><span class="lines">@@ -317,18 +317,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return path + "/HSTS.plist";
</span><del>-#else
- notImplemented();
- return [@"" stringByStandardizingPath];
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-String WebContext::parentBundleDirectory() const
-{
- return [[[NSBundle mainBundle] bundlePath] stringByStandardizingPath];
-}
-
</del><span class="cx"> String WebContext::webContentHSTSDatabasePath() const
</span><span class="cx"> {
</span><span class="cx"> String path = pathForProcessContainer();
</span><span class="lines">@@ -348,13 +338,12 @@
</span><span class="cx"> return path + "/HSTS.plist";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> String WebContext::containerTemporaryDirectory() const
</span><span class="cx"> {
</span><span class="cx"> String path = NSTemporaryDirectory();
</span><span class="cx"> return stringByResolvingSymlinksInPath(path);
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> String WebContext::platformDefaultWebSQLDatabaseDirectory()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (172499 => 172500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-08-12 22:43:19 UTC (rev 172499)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-08-12 22:43:27 UTC (rev 172500)
</span><span class="lines">@@ -167,10 +167,10 @@
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.webSQLDatabaseDirectoryExtensionHandle);
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.applicationCacheDirectoryExtensionHandle);
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.diskCacheDirectoryExtensionHandle);
</span><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> SandboxExtension::consumePermanently(parameters.cookieStorageDirectoryExtensionHandle);
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.openGLCacheDirectoryExtensionHandle);
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.containerTemporaryDirectoryExtensionHandle);
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> SandboxExtension::consumePermanently(parameters.hstsDatabasePathExtensionHandle);
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>