Changeset 168605 in webkit

Timestamp:

May 11, 2014, 5:08:02 PM (12 years ago)

Author:

andersca@apple.com

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):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebProcessCreationParameters.cpp (modified) (2 diffs)
• Shared/WebProcessCreationParameters.h (modified) (1 diff)
• UIProcess/WebContext.cpp (modified) (1 diff)
• WebProcess/cocoa/WebProcessCocoa.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-05-11  Anders Carlsson  <andersca@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.lim@samsung.com>
 

trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp

@@ -63 +63 @@
     encoder << databaseDirectory;
     encoder << databaseDirectoryExtensionHandle;
-    encoder << localStorageDirectory;
-    encoder << localStorageDirectoryExtensionHandle;
     encoder << diskCacheDirectory;
     encoder << diskCacheDirectoryExtensionHandle;
@@ -153 +151 @@
     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;

trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h

@@ -69 +69 @@
     String databaseDirectory;
     SandboxExtension::Handle databaseDirectoryExtensionHandle;
-    String localStorageDirectory;
-    SandboxExtension::Handle localStorageDirectoryExtensionHandle;
     String diskCacheDirectory;
     SandboxExtension::Handle diskCacheDirectoryExtensionHandle;

trunk/Source/WebKit2/UIProcess/WebContext.cpp

@@ -563 +563 @@
         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())

trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm

@@ -162 +162 @@
 #if ENABLE(WEB_PROCESS_SANDBOX)
     SandboxExtension::consumePermanently(parameters.uiProcessBundleResourcePathExtensionHandle);
-    SandboxExtension::consumePermanently(parameters.localStorageDirectoryExtensionHandle);
     SandboxExtension::consumePermanently(parameters.databaseDirectoryExtensionHandle);
     SandboxExtension::consumePermanently(parameters.applicationCacheDirectoryExtensionHandle);