Title: [168605] trunk/Source/WebKit2
Revision
168605
Author
ander...@apple.com
Date
2014-05-11 17:08:02 -0700 (Sun, 11 May 2014)

Log Message

Remove local storage directory and sandbox extension from WebProcessCreationParameters
https://bugs.webkit.org/show_bug.cgi?id=132808

Reviewed by Beth Dakin.

* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):
* Shared/WebProcessCreationParameters.h:
* UIProcess/WebContext.cpp:
(WebKit::WebContext::createNewWebProcess):
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformInitializeWebProcess):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (168604 => 168605)


--- trunk/Source/WebKit2/ChangeLog	2014-05-11 23:44:49 UTC (rev 168604)
+++ trunk/Source/WebKit2/ChangeLog	2014-05-12 00:08:02 UTC (rev 168605)
@@ -1,3 +1,19 @@
+2014-05-11  Anders Carlsson  <ander...@apple.com>
+
+        Remove local storage directory and sandbox extension from WebProcessCreationParameters
+        https://bugs.webkit.org/show_bug.cgi?id=132808
+
+        Reviewed by Beth Dakin.
+
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::encode):
+        (WebKit::WebProcessCreationParameters::decode):
+        * Shared/WebProcessCreationParameters.h:
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::createNewWebProcess):
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::platformInitializeWebProcess):
+
 2014-05-11  Jaehun Lim  <ljaehun....@samsung.com>
 
         Unreviewed, CMake build fix after r168603

Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (168604 => 168605)


--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp	2014-05-11 23:44:49 UTC (rev 168604)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp	2014-05-12 00:08:02 UTC (rev 168605)
@@ -62,8 +62,6 @@
     encoder << applicationCacheDirectoryExtensionHandle;
     encoder << databaseDirectory;
     encoder << databaseDirectoryExtensionHandle;
-    encoder << localStorageDirectory;
-    encoder << localStorageDirectoryExtensionHandle;
     encoder << diskCacheDirectory;
     encoder << diskCacheDirectoryExtensionHandle;
     encoder << cookieStorageDirectory;
@@ -152,10 +150,6 @@
         return false;
     if (!decoder.decode(parameters.databaseDirectoryExtensionHandle))
         return false;
-    if (!decoder.decode(parameters.localStorageDirectory))
-        return false;
-    if (!decoder.decode(parameters.localStorageDirectoryExtensionHandle))
-        return false;
     if (!decoder.decode(parameters.diskCacheDirectory))
         return false;
     if (!decoder.decode(parameters.diskCacheDirectoryExtensionHandle))

Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (168604 => 168605)


--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h	2014-05-11 23:44:49 UTC (rev 168604)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h	2014-05-12 00:08:02 UTC (rev 168605)
@@ -68,8 +68,6 @@
     SandboxExtension::Handle applicationCacheDirectoryExtensionHandle;
     String databaseDirectory;
     SandboxExtension::Handle databaseDirectoryExtensionHandle;
-    String localStorageDirectory;
-    SandboxExtension::Handle localStorageDirectoryExtensionHandle;
     String diskCacheDirectory;
     SandboxExtension::Handle diskCacheDirectoryExtensionHandle;
     String cookieStorageDirectory;

Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (168604 => 168605)


--- trunk/Source/WebKit2/UIProcess/WebContext.cpp	2014-05-11 23:44:49 UTC (rev 168604)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp	2014-05-12 00:08:02 UTC (rev 168605)
@@ -562,10 +562,6 @@
     if (!parameters.databaseDirectory.isEmpty())
         SandboxExtension::createHandleForReadWriteDirectory(parameters.databaseDirectory, parameters.databaseDirectoryExtensionHandle);
 
-    parameters.localStorageDirectory = localStorageDirectory();
-    if (!parameters.localStorageDirectory.isEmpty())
-        SandboxExtension::createHandleForReadWriteDirectory(parameters.localStorageDirectory, parameters.localStorageDirectoryExtensionHandle);
-
     parameters.diskCacheDirectory = diskCacheDirectory();
     if (!parameters.diskCacheDirectory.isEmpty())
         SandboxExtension::createHandleForReadWriteDirectory(parameters.diskCacheDirectory, parameters.diskCacheDirectoryExtensionHandle);

Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (168604 => 168605)


--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm	2014-05-11 23:44:49 UTC (rev 168604)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm	2014-05-12 00:08:02 UTC (rev 168605)
@@ -161,7 +161,6 @@
 {
 #if ENABLE(WEB_PROCESS_SANDBOX)
     SandboxExtension::consumePermanently(parameters.uiProcessBundleResourcePathExtensionHandle);
-    SandboxExtension::consumePermanently(parameters.localStorageDirectoryExtensionHandle);
     SandboxExtension::consumePermanently(parameters.databaseDirectoryExtensionHandle);
     SandboxExtension::consumePermanently(parameters.applicationCacheDirectoryExtensionHandle);
     SandboxExtension::consumePermanently(parameters.diskCacheDirectoryExtensionHandle);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to